sync everything to github

Author: toshok

.gitignore

@@ -10,3 +10,7 @@
 *.lai
 *.la
 *.a
+
+*~
+*.ll
+*.s

Makefile

@@ -0,0 +1,19 @@
+LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
+LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
+LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit x86codegen`
+LLVM_LIBS:="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
+
+make-shell:
+	$(MAKE) -C shell
+
+make-llvm:
+	cd llvm && ./configure --disable-jit
+	$(MAKE) -C llvm
+
+
+test: foo.js main.o libecho.a
+	-./ejs -f foo.js 2> foo-tmp.ll
+	llvm-as < foo-tmp.ll | opt -mem2reg -simplifycfg | llvm-dis > foo.ll
+	llc -march=x86-64 -O0 foo.ll
+	sed -e s/vmovsd/movsd/ < foo.s > foo.sed.s
+	gcc -o test foo.sed.s main.o -lecho

STUFF

@@ -0,0 +1,40 @@
+
+
+* lexer
+
+* parser
+
+* desugar
+   - get rid of immediately applied functions:
+
+             (function () { /* ... */ })();
+
+         can become nothing but:
+
+             { /* ... */ }
+
+         if there are no 'vars' inside it.  if there are, we hoist the
+         vars to the toplevel of the function and convert them to
+         lets, then replace it with the { }
+
+* lambda lifting
+
+* optimizations
+
+* ffi
+
+  - we need some sort of DSL for external C-linkage functions.  bonus points for a syntax that allows objc messages as well.
+    maybe something like:
+
+  @extern void print_internal_i32 (@i32(theInt))
+  @extern void print_internal_d64 (@d64(theDouble))
+  @extern void print_internal_string (@string(theString))
+
+  function print(theObj) {
+    if (theObj === null)
+      print_internal_string ("null");
+    else if (typeof(theObj) == "undefined")
+      print_internal_string ("undefined");
+    else if (typeof(theObj) == "object")
+      print_internal_string (theObj.toString());
+  }

ejs

@@ -0,0 +1,102 @@
+#!/usr/bin/python
+#
+# Narcissus 'shell' for use with jstests.py
+# Expects to be in the same directory as ./js
+# Expects the Narcissus src files to be in ./narcissus/
+
+import os, re, sys, signal
+from subprocess import *
+from optparse import OptionParser
+
+THIS_DIR = os.path.dirname(__file__)
+SPIDERMONKEY_DIR = os.path.abspath(os.path.join(THIS_DIR, 'spidermonkey'))
+
+if 'NJS_SHELL' in os.environ:
+    js_cmd = os.path.abspath(os.environ['NJS_SHELL'])
+else:
+    js_cmd = os.path.abspath(os.path.join(THIS_DIR, 'js'))
+
+narc_shell = os.path.join(SPIDERMONKEY_DIR, "shell.js")
+
+def handler(signum, frame):
+    print ''
+    # the exit code produced by ./js on SIGINT
+    sys.exit(130)
+
+signal.signal(signal.SIGINT, handler)
+
+if __name__ == '__main__':
+    op = OptionParser(usage='%prog [TEST-SPECS]')
+    op.add_option('-f', '--file', dest='js_files', action='append',
+            help='JS file to load', metavar='FILE')
+    op.add_option('-e', '--expression', dest='js_exps', action='append',
+            help='JS expression to evaluate')
+    op.add_option('-i', '--interactive', dest='js_interactive', action='store_true',
+            help='enable interactive shell')
+    op.add_option('-I', '--interactive-meta', dest='js_interactive_meta', action='store_true',
+            help='load Narcissus but run interactive SpiderMonkey shell')
+    op.add_option('-E', '--expression-meta', dest='js_exps_meta', action='append',
+            help='expression to evaluate with SpiderMonkey after loading Narcissus')
+    op.add_option('-P', '--parse-only', dest='js_parseonly', action='store_true',
+            help='stop after the parsing stage and output pretty-printed source code')
+    op.add_option('-w', '--web-compatible', dest='js_webcompatible', action='store_true',
+            help='disable non-standard Mozilla extensions')
+    op.add_option('-p', '--paren-free', dest='js_parenfree', action='store_true',
+            help='use experimental paren-free syntax')
+    op.add_option('-d', '--desugar', dest='js_desugar', action='store_true',
+            help='desugar SpiderMonkey language extensions')
+
+    (options, args) = op.parse_args()
+
+    cmd = ""
+
+    if options.js_webcompatible:
+        cmd += 'Narcissus.options.mozillaMode = false; '
+
+    if options.js_parenfree:
+        cmd += 'Narcissus.options.parenFreeMode = true; '
+
+    if options.js_desugar:
+        cmd += 'Narcissus.options.desugarExtensions = true; '
+
+    if options.js_exps:
+        for exp in options.js_exps:
+            if options.js_parseonly:
+                cmd += 'print(Narcissus.decompiler.pp(Narcissus.parser.parse("%s"))); ' % exp.replace('"', '\\"')
+            else:
+                #cmd += 'Narcissus.interpreter.evaluate("%s"); ' % exp.replace('"', '\\"')
+                cmd += 'Narcissus.compiler.compile(Narcissus.parser.parse("%s")) || quit(1);' % exp.replace('"', '\\"')
+
+    if options.js_files:
+        for file in options.js_files:
+            if options.js_parseonly:
+                cmd += 'print(Narcissus.decompiler.pp(Narcissus.parser.parse(snarf("%(file)s"), "%(file)s", 1))); ' % { 'file':file }
+            else:
+                cmd += 'Narcissus.compiler.compile(Narcissus.parser.parse(snarf("%(file)s"), "%(file)s", 1)) || quit(1);' % { 'file': file }
+
+    if (not options.js_exps) and (not options.js_files):
+        options.js_interactive = True
+
+    argv = [js_cmd, '-f', narc_shell]
+
+    if options.js_exps_meta:
+        argv += ['-e', cmd]
+        for exp in options.js_exps_meta:
+            argv += ['-e', exp]
+        if options.js_interactive_meta:
+            argv += ['-i']
+    elif options.js_interactive_meta:
+        argv += ['-e', cmd, '-i']
+    else:
+        if options.js_interactive:
+            cmd += 'Narcissus.interpreter.repl();'
+            argv = ['rlwrap'] + argv
+        argv += ['-e', cmd]
+
+    try:
+        retcode = Popen(argv).wait();
+    except OSError as e:
+        if e.errno is 2 and options.js_interactive:
+            retcode = Popen(argv[1:]).wait()
+
+    exit(retcode)

foo.js

@@ -0,0 +1,48 @@
+function add2(n) {
+  var o = n;
+  {
+    var p = o+2;
+  }
+
+  p = o + 4;
+  return p;
+}
+
+function fib(n) {
+  if (n === 0 || n === 1)
+    return 1;
+  else
+    return fib(n-1) + fib(n-2);
+}
+
+/*
+ * not yet - 'this' isn't supported, and neither is 'new', and assigning into property accessors ('dot')
+ */
+/*
+function Fib() {
+  this.gen = function(n) {
+    if (n === 0 || n === 1)
+      return 1;
+    else
+      return this.gen(n-1) + this.gen(n-2);
+  };
+}
+*/
+
+print("Fibonacci function");
+print(fib(0));
+print(fib(1));
+print(fib(2));
+print(fib(3));
+print(fib(4));
+print(fib(5));
+print(fib(6));
+print(fib(7));
+print(fib(8));
+print(fib(9));
+
+print("function with local variables");
+var add2arg=99;
+print(add2(add2arg));
+
+print ("Fibonacci object");

lib/browser.js

@@ -0,0 +1,66 @@
+/* -*- Mode: JS; tab-width: 4; indent-tabs-mode: nil; -*-
+ * vim: set sw=4 ts=8 et tw=78:
+/* ***** BEGIN LICENSE BLOCK *****
+ *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Narcissus JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Brendan Eich <[email protected]>.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+/*
+ * Narcissus - JS implemented in JS.
+ *
+ * Browser-specific tweaks needed for Narcissus to execute properly
+ */
+
+var interpreter = require('./interpreter');
+var globalBase = interpreter.globalBase;
+
+// Prevent setTimeout from breaking out to SpiderMonkey
+globalBase.setTimeout = function(code, delay) {
+    var timeoutCode = (typeof code === "string") ?
+            function() { interpreter.evaluate(code); } :
+            code;
+    return setTimeout(timeoutCode, delay);
+};
+
+// Prevent setInterval from breaking out to SpiderMonkey
+globalBase.setInterval = function(code, delay) {
+    var timeoutCode = (typeof code === "string") ?
+            function() { interpreter.evaluate(code); } :
+            code;
+    return setInterval(timeoutCode, delay);
+};
+
+// Hack to avoid problems with the Image constructor in Narcissus.
+globalBase.Image = function() {};