feat: compile api

Author: antfu

src/macro.js

@@ -1,4 +1,4 @@
-function extractMacros(lang, txt, { lib, reader }) {
+function extractMacros(txt, { lib, reader, lang }) {
   function getImports() {
     var imps = [];
     for (var i = 0; i < txt.length; i++) {
@@ -108,7 +108,7 @@ function extractMacros(lang, txt, { lib, reader }) {
     } else {
       isrc = reader(imports[i]);
     }
-    macros = macros.concat(extractMacros(lang, isrc, { lib, reader }));
+    macros = macros.concat(extractMacros(isrc, { lib, reader, lang }));
   }
   return macros;
 }

src/parser.js

@@ -653,8 +653,21 @@ function defaultReader(x) {
   }
 }
 
-function compile(lang, txt, options = {}) {
+function compile(arg1, arg2, arg3) {
+  let options = {};
+  let txt = "";
+
+  if (typeof arg2 === "string") {
+    // backward compatible
+    txt = arg2;
+    options = { ...arg3, lang: arg1 };
+  } else {
+    txt = arg1;
+    options = arg2;
+  }
+
   const {
+    lang = "js",
     romanizeIdentifiers = "none",
     resetVarCnt,
     logCallback = x =>
@@ -695,7 +708,7 @@ function compile(lang, txt, options = {}) {
     return 0;
   }
 
-  var macros = extractMacros(lang, txt, { lib, reader });
+  var macros = extractMacros(txt, { lib, reader, lang });
   txt = expandMacros(txt, macros);
 
   logCallback("\n\n=== [PASS 0] EXPAND-MACROS ===");
@@ -743,7 +756,8 @@ function compile(lang, txt, options = {}) {
     targ =
       mwrapper(
         imports[i],
-        compile(lang, isrc, {
+        compile(isrc, {
+          lang,
           romanizeIdentifiers,
           resetVarCnt: false,
           logCallback,
@@ -816,7 +830,7 @@ function evalCompiled(compiledCode, options = {}) {
 function execute(source, options = {}) {
   const { lang = "js" } = options;
   isLangSupportedForEval(lang);
-  const compiled = compile(lang, source, options);
+  const compiled = compile(source, options);
   evalCompiled(compiled, options);
 }
 

tools/make_ide.js

@@ -143,10 +143,11 @@ function main() {
   function run() {
     highlightCode();
     document.getElementById("out").innerText = "";
-    var code = compile("js", ed.innerText, {
+    var code = compile(ed.innerText, {
+      lang: "js",
       romanizeIdentifiers: selr.value,
       resetVarCnt: true,
-      errorCallback: log2div,
+      errorCallback: (...args) => (outdiv.innerText += args.join(" ") + "\n"),
       lib: STDLIB,
       reader: x => prgms[x]
     });

tools/make_site.js

@@ -40,7 +40,8 @@ function main() {
     highlight([ed]);
     out.innerText = "";
     var hasError = false;
-    var code = compile("js", ed.innerText, {
+    var code = compile(ed.innerText, {
+      lang: "js",
       romanizeIdentifiers: "none",
       errorCallback: function(x) {
         hasError = true;
@@ -50,13 +51,15 @@ function main() {
     if (i == 0) {
       document.getElementById("js").innerText =
         "// JavaScript\n" + js_beautify(code);
-      var py = compile("py", ed.innerText, {
+      var py = compile(ed.innerText, {
+        lang: "py",
         romanizeIdentifiers: "none",
         errorCallback: () => 0
       });
       document.getElementById("py").innerText =
         "# Python\n" + py.split("#####\n")[1];
-      var rb = compile("rb", ed.innerText, {
+      var rb = compile(ed.innerText, {
+        lang: "rb",
         romanizeIdentifiers: "none",
         errorCallback: () => 0
       });