Add -l for emitting load instead of require

syg · syg · commit e4c369edb1d1 · 2012-05-30T16:55:26.000-07:00
diff --git a/src/compiler.js b/src/compiler.js
@@ -1572,13 +1572,17 @@
     return new CallExpression(new Identifier("require"), [new Literal(name)]);
   }
 
-  function createModule(program, name, bare) {
+  function createModule(program, name, bare, loadInstead) {
     var body = [];
     var cachedMEMORY = program.frame.cachedMEMORY;
     if (cachedMEMORY) {
       var mdecl;
       if (name === "memory") {
         mdecl = new VariableDeclarator(cachedMEMORY, new Identifier("exports"));
+      } else if (loadInstead) {
+        mdecl = new VariableDeclarator(cachedMEMORY, new SequenceExpression([
+          new CallExpression(new Identifier("load"), [new Literal("memory.js")]),
+          new Identifier("memory")]));
       } else {
         mdecl = new VariableDeclarator(cachedMEMORY, createRequire("memory"));
       }
@@ -1633,7 +1637,7 @@
     // Pass 4.
     node = node.lower(o);
 
-    return T.flatten(createModule(node, name, options.bare));
+    return T.flatten(createModule(node, name, options.bare, options["load-instead"]));
   }
 
   exports.compile = compile;
diff --git a/src/ljc.js b/src/ljc.js
@@ -111,6 +111,7 @@
       ["A", "emit-ast",     false, "Do not generate JS, emit AST"],
       ["P", "pretty-print", false, "Pretty-print AST instead of emitting JSON (with -A)"],
       ["b", "bare",         false, "Do not wrap in a module"],
+      ["l", "load-instead", false, "Emit load('memory') instead of require('memory')"],
       ["W", "warn",         true,  "Print warnings (enabled by default)"],
       ["Wconversion", null, false, "Print intra-integer and pointer conversion warnings"],
       ["0", "simple-log",   false, "Log simple messages. No colors and snippets."],
