integrate desugaring into jsexec

jorendorff · Aug 1, 2011 · 255ddd6 · 255ddd6
1 parent c49f7a6
commit 255ddd6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/lib/jsdefs.js b/lib/jsdefs.js
@@ -56,7 +56,9 @@
         options: {
             version: 185,
             // Global variables to hide from the interpreter
-            hiddenHostGlobals: { Narcissus: true }
+            hiddenHostGlobals: { Narcissus: true },
+            // Desugar SpiderMonkey language extensions?
+            desugarExtensions: false
         },
         hostSupportsEvalConst: (function() {
             try {

diff --git a/lib/jsdesugar.js b/lib/jsdesugar.js
@@ -54,6 +54,7 @@
  * - destructuring
  * - array comprehensions
  * - generator expressions
+ * - expression functions
  */
 
 

diff --git a/lib/jsexec.js b/lib/jsexec.js
@@ -60,6 +60,7 @@ Narcissus.interpreter = (function() {
     var definitions = Narcissus.definitions;
     var resolver = Narcissus.resolver;
     var hostGlobal = Narcissus.hostGlobal;
+    var desugaring = Narcissus.desugaring;
 
     // Set constants in the local scope.
     eval(definitions.consts);
@@ -1330,6 +1331,8 @@ Narcissus.interpreter = (function() {
 
         var x = new ExecutionContext(GLOBAL_CODE, Narcissus.options.version);
         var ast = parser.parse(s, f, l);
+        if (Narcissus.options.desugarExtensions)
+            ast = desugaring.desugar(ast);
         if (x.version === "harmony") {
             resolveGlobal(ast);
             instantiateModules(ast, x.scope);
@@ -1434,6 +1437,8 @@ Narcissus.interpreter = (function() {
 
             try {
                 var ast = parser.parseStdin(src, ln, "...  ", isCommand);
+                if (Narcissus.options.desugarExtensions)
+                    ast = desugaring.desugar(ast);
                 if (x.version === "harmony") {
                     resolveGlobal(ast);
                     instantiateModules(ast, x.scope);