Remove remaining uses of eval in the JS compiler

Use `vm.runInCurrentContext` instead.

We already use this in the preprocessor, but not we also use it for
macro expansion and loading of the compiler code itself.

This change should facilitate future changes to the JS compiler, such
as changing the compiler itself to use JS modules.

Author: sbc100

src/compiler.mjs

@@ -28,12 +28,9 @@ globalThis.printErr = (x) => {
 function find(filename) {
   assert(filename);
   const dirname = url.fileURLToPath(new URL('.', import.meta.url));
-  const prefixes = [dirname, process.cwd()];
-  for (let i = 0; i < prefixes.length; ++i) {
-    const combined = path.join(prefixes[i], filename);
-    if (fs.existsSync(combined)) {
-      return combined;
-    }
+  const combined = path.join(dirname, filename);
+  if (fs.existsSync(combined)) {
+    return combined;
   }
   return filename;
 }
@@ -45,8 +42,8 @@ globalThis.read = (filename) => {
 };
 
 function load(f) {
-  (0, eval)(read(f) + '//# sourceURL=' + find(f));
-};
+  vm.runInThisContext(read(f), { filename: find(f) });
+}
 
 // Basic utilities
 load('utility.js');

src/jsifier.js

@@ -106,7 +106,7 @@ function preJS() {
   let result = '';
   for (const fileName of PRE_JS_FILES) {
     if (shouldPreprocess(fileName)) {
-      result += processMacros(preprocess(fileName));
+      result += processMacros(preprocess(fileName), fileName);
     } else {
       result += read(fileName);
     }
@@ -603,7 +603,7 @@ function(${args}) {
   function includeFile(fileName, needsPreprocess = true) {
     print(`// include: ${fileName}`);
     if (needsPreprocess) {
-      print(processMacros(preprocess(fileName)));
+      print(processMacros(preprocess(fileName), fileName));
     } else {
       print(read(fileName));
     }

src/modules.js

@@ -233,7 +233,7 @@ globalThis.LibraryManager = {
       }
       currentFile = filename;
       try {
-        processed = processMacros(preprocess(filename));
+        processed = processMacros(preprocess(filename), filename);
         vm.runInThisContext(processed, { filename: filename.replace(/\.\w+$/, '.preprocessed$&') });
       } catch (e) {
         error(`failure to execute js library "${filename}":`);

src/parseTools.js

@@ -9,23 +9,20 @@
  */
 
 globalThis.FOUR_GB = 4 * 1024 * 1024 * 1024;
+globalThis.WASM_PAGE_SIZE = 64 * 1024;
+
 const FLOAT_TYPES = new Set(['float', 'double']);
 
 // Does simple 'macro' substitution, using Django-like syntax,
 // {{{ code }}} will be replaced with |eval(code)|.
 // NOTE: Be careful with that ret check. If ret is |0|, |ret ? ret.toString() : ''| would result in ''!
-function processMacros(text) {
+function processMacros(text, filename) {
   // The `?` here in makes the regex non-greedy so it matches with the closest
   // set of closing braces.
   // `[\s\S]` works like `.` but include newline.
   return text.replace(/{{{([\s\S]+?)}}}/g, (_, str) => {
-    try {
-      const ret = eval(str);
-      return ret !== null ? ret.toString() : '';
-    } catch (ex) {
-      ex.stack = `In the following macro:\n\n${str}\n\n${ex.stack}`;
-      throw ex;
-    }
+    const ret = vm.runInThisContext(str, { filename: filename });
+    return ret !== null ? ret.toString() : '';
   });
 }
 
@@ -180,21 +177,21 @@ function needsQuoting(ident) {
 globalThis.POINTER_SIZE = MEMORY64 ? 8 : 4;
 globalThis.POINTER_MAX = MEMORY64 ? 'Number.MAX_SAFE_INTEGER' : '0xFFFFFFFF';
 globalThis.STACK_ALIGN = 16;
-const POINTER_BITS = POINTER_SIZE * 8;
-const POINTER_TYPE = `u${POINTER_BITS}`;
-const POINTER_JS_TYPE = MEMORY64 ? "'bigint'" : "'number'";
-const POINTER_SHIFT = MEMORY64 ? '3' : '2';
-const POINTER_HEAP = MEMORY64 ? 'HEAP64' : 'HEAP32';
-const LONG_TYPE = `i${POINTER_BITS}`;
+globalThis.POINTER_BITS = POINTER_SIZE * 8;
+globalThis.POINTER_TYPE = `u${POINTER_BITS}`;
+globalThis.POINTER_JS_TYPE = MEMORY64 ? "'bigint'" : "'number'";
+globalThis.POINTER_SHIFT = MEMORY64 ? '3' : '2';
+globalThis.POINTER_HEAP = MEMORY64 ? 'HEAP64' : 'HEAP32';
+globalThis.LONG_TYPE = `i${POINTER_BITS}`;
 
-const SIZE_TYPE = POINTER_TYPE;
+globalThis.SIZE_TYPE = POINTER_TYPE;
 
 
 // Similar to POINTER_TYPE, but this is the actual wasm type that is
 // used in practice, while POINTER_TYPE is the more refined internal
 // type (that is unsigned, where as core wasm does not have unsigned
 // types).
-const POINTER_WASM_TYPE = `i${POINTER_BITS}`;
+globalThis.POINTER_WASM_TYPE = `i${POINTER_BITS}`;
 
 function isPointerType(type) {
   return type[type.length - 1] == '*';
@@ -699,9 +696,6 @@ function makeRetainedCompilerSettings() {
   return ret;
 }
 
-// In wasm, the heap size must be a multiple of 64KiB.
-const WASM_PAGE_SIZE = 65536;
-
 // Receives a function as text, and a function that constructs a modified
 // function, to which we pass the parsed-out arguments, body, and possible
 // "async" prefix of the input function. Returns the output of that function.

tools/preprocessor.mjs

@@ -36,12 +36,10 @@ global.printErr = (x) => {
 
 function find(filename) {
   const dirname = url.fileURLToPath(new URL('.', import.meta.url));
-  const prefixes = [process.cwd(), path.join(dirname, '..', 'src')];
-  for (let i = 0; i < prefixes.length; ++i) {
-    const combined = path.join(prefixes[i], filename);
-    if (fs.existsSync(combined)) {
-      return combined;
-    }
+  const prefixe = path.join(dirname, '..', 'src');
+  const combined = path.join(prefixe, filename);
+  if (fs.existsSync(combined)) {
+    return combined;
   }
   return filename;
 }
@@ -52,7 +50,7 @@ global.read = (filename) => {
 };
 
 global.load = (f) => {
-  (0, eval)(read(f) + '//# sourceURL=' + find(f));
+  vm.runInThisContext(read(f), { filename: find(f) });
 };
 
 assert(args.length >= 2);
@@ -65,5 +63,8 @@ load('utility.js');
 load('modules.js');
 load('parseTools.js');
 
-const output = expandMacros ? processMacros(preprocess(inputFile)) : preprocess(inputFile);
+let output = preprocess(inputFile);
+if (expandMacros) {
+  output = processMacros(output, inputFile)
+}
 process.stdout.write(output);