porffor 0.39.1 → 0.39.3

package/compiler/codegen.js

@@ -335,7 +335,7 @@ const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysV
 ];
 
 const generateIdent = (scope, decl) => {
-  const lookup = rawName => {
+  const lookup = (rawName, failEarly = false) => {
     const name = mapName(rawName);
     let local = scope.locals[rawName];
 
@@ -376,11 +376,18 @@ const generateIdent = (scope, decl) => {
       let parent = rawName.slice(2).split('_').slice(0, -1).join('_');
       if (parent.includes('_')) parent = '__' + parent;
 
-      const parentLookup = lookup(parent);
+      const parentLookup = lookup(parent, true);
       if (!parentLookup[1]) return number(UNDEFINED);
     }
 
-    if (local?.idx === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
+    if (local?.idx === undefined) {
+      if (failEarly) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
+
+      return [ [ null, () => {
+        // try generating again at the end
+        return lookup(rawName, true);
+      }, 1 ] ];
+    }
 
     return [
       [ Opcodes.local_get, local.idx ],
@@ -397,16 +404,14 @@ const generateReturn = (scope, decl) => {
   const arg = decl.argument ?? DEFAULT_VALUE();
 
   if (scope.async) {
-    typeUsed(scope, TYPES.promise);
-
     return [
       // resolve promise with return value
-      [ Opcodes.local_get, scope.locals['#async_out_promise'].idx ],
-      ...number(TYPES.promise, Valtype.i32),
-
       ...generate(scope, arg),
       ...(scope.returnType != null ? [] : getNodeType(scope, arg)),
 
+      [ Opcodes.local_get, scope.locals['#async_out_promise'].idx ],
+      ...number(TYPES.promise, Valtype.i32),
+
       [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_resolve').index ],
       [ Opcodes.drop ],
       [ Opcodes.drop ],
@@ -889,12 +894,17 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
     // try hacky version for built-ins first
     const rightName = decl.right.name;
     if (rightName) {
-      const checkType = TYPES[rightName.toLowerCase()];
+      let checkType = TYPES[rightName.toLowerCase()];
       if (checkType != null && rightName === TYPE_NAMES[checkType] && !rightName.endsWith('Error')) {
         const out = generate(scope, decl.left);
         disposeLeftover(out);
 
-        if ([TYPES.number, TYPES.boolean, TYPES.string].includes(checkType)) {
+        // switch primitive types to primitive object types
+        if (checkType === TYPES.number) checkType = TYPES.numberobject;
+        if (checkType === TYPES.boolean) checkType = TYPES.booleanobject;
+
+        // currently unsupported types
+        if ([TYPES.string].includes(checkType)) {
           out.push(...number(0));
         } else {
           out.push(
@@ -1032,7 +1042,7 @@ const asmFuncToAsm = (scope, func) => {
         return [ [ null, () => {
           if (types.some(x => usedTypes.has(x))) return wasm();
           return [];
-        } ] ];
+        }, 0 ] ];
       }
     }
   });
@@ -1160,7 +1170,11 @@ const isExistingProtoFunc = name => {
   return false;
 };
 
-const getType = (scope, _name) => {
+const getType = (scope, _name, failEarly = false) => {
+  const fallback = failEarly ? number(TYPES.undefined, Valtype.i32) : [ [ null, () => {
+    return getType(scope, _name, true);
+  }, 1 ] ];
+
   const name = mapName(_name);
 
   if (Object.hasOwn(builtinVars, name)) return number(builtinVars[name].type ?? TYPES.number, Valtype.i32);
@@ -1172,7 +1186,7 @@ const getType = (scope, _name) => {
     if (typeLocal) return [ [ Opcodes.local_get, typeLocal.idx ] ];
 
     // todo: warn here?
-    return number(TYPES.undefined, Valtype.i32);
+    return fallback;
   }
 
   if (name === 'arguments' && scope.name !== 'main' && !scope.arrow) {
@@ -1186,7 +1200,7 @@ const getType = (scope, _name) => {
     if (typeLocal) return [ [ Opcodes.global_get, typeLocal.idx ] ];
 
     // todo: warn here?
-    return number(TYPES.undefined, Valtype.i32);
+    return fallback;
   }
 
   if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(importedFuncs, name) ||
@@ -1195,7 +1209,7 @@ const getType = (scope, _name) => {
 
   if (isExistingProtoFunc(name)) return number(TYPES.function, Valtype.i32);
 
-  return number(TYPES.undefined, Valtype.i32);
+  return fallback;
 };
 
 const setType = (scope, _name, type) => {
@@ -1507,7 +1521,10 @@ const countLeftover = wasm => {
 
   for (let i = 0; i < wasm.length; i++) {
     const inst = wasm[i];
-    if (inst[0] == null) continue;
+    if (depth === 0 && inst[0] == null) {
+      if (typeof inst[1] === 'function' && typeof inst[2] === 'number') count += inst[2];
+      continue;
+    }
 
     if (depth === 0 && (inst[0] === Opcodes.if || inst[0] === Opcodes.block || inst[0] === Opcodes.loop)) {
       if (inst[0] === Opcodes.if) count--;
@@ -1538,7 +1555,7 @@ const countLeftover = wasm => {
           count += 2; // fixed return (value, type)
         } else count--;
 
-    // console.log(count, decompile([ inst ]).slice(0, -1));
+    // console.log(count, depth, decompile([ inst ]).slice(0, -1));
   }
 
   return count;
@@ -2861,7 +2878,7 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary, fallthrough = fals
           out = [];
           if (types.some(x => usedTypes.has(x))) add();
           return out;
-        }]);
+        }, 0 ]);
       }
     }
   }
@@ -4542,16 +4559,7 @@ const generateForIn = (scope, decl) => {
 };
 
 const generateSwitch = (scope, decl) => {
-  const tmp = localTmp(scope, '#switch_disc');
-  const out = [
-    ...generate(scope, decl.discriminant),
-    [ Opcodes.local_set, tmp ],
-
-    [ Opcodes.block, Blocktype.void ]
-  ];
-
-  depth.push('switch');
-
+  // special fast path just for `switch (Porffor.rawType(...))`
   if (decl.discriminant.type === 'CallExpression' && decl.discriminant.callee.type === 'Identifier' && decl.discriminant.callee.name === '__Porffor_rawType') {
     const cases = []
     let canTypeCheck = true;
@@ -4574,28 +4582,42 @@ const generateSwitch = (scope, decl) => {
     }
 
     if (canTypeCheck) {
-      const out = typeSwitch(scope,
-        getNodeType(scope, decl.discriminant.arguments[0]),
-        () => {
-          const bc = [];
-          let types = [];
-          for (const [ type, consequent ] of cases) {
-            types.push(type);
-
-            if (consequent.length !== 0) {
-              bc.push([ types, () => generate(scope, { type: 'BlockStatement', body: consequent }) ]);
-              types = [];
-            }
+      depth.push('switch');
+
+      const out = typeSwitch(scope, getNodeType(scope, decl.discriminant.arguments[0]), () => {
+        const bc = [];
+        let types = [];
+        for (const [ type, consequent ] of cases) {
+          types.push(type);
+
+          if (consequent.length !== 0) {
+            bc.push([ types, () => generate(scope, { type: 'BlockStatement', body: consequent }) ]);
+            types = [];
           }
+        }
 
-          return bc;
-        }, Blocktype.void, true);
+        return bc;
+      }, Blocktype.void, true);
 
       depth.pop();
       return out;
     }
   }
 
+  const tmpName = '#switch' + uniqId();
+  const tmp = localTmp(scope, tmpName);
+  localTmp(scope, tmpName + '#type', Valtype.i32);
+
+  const out = [
+    ...generate(scope, decl.discriminant),
+    [ Opcodes.local_set, tmp ],
+    ...setType(scope, tmpName, getNodeType(scope, decl.discriminant)),
+
+    [ Opcodes.block, Blocktype.void ]
+  ];
+
+  depth.push('switch');
+
   const cases = decl.cases.slice();
   const defaultCase = cases.findIndex(x => x.test == null);
   if (defaultCase != -1) {
@@ -4613,9 +4635,16 @@ const generateSwitch = (scope, decl) => {
     if (x.test) {
       // todo: this should use same value zero
       out.push(
-        [ Opcodes.local_get, tmp ],
-        ...generate(scope, x.test),
-        [ Opcodes.eq ],
+        ...generate(scope, {
+          type: 'BinaryExpression',
+          operator: '===',
+          left: {
+            type: 'Identifier',
+            name: tmpName
+          },
+          right: x.test
+        }),
+        Opcodes.i32_to_u,
         [ Opcodes.br_if, i ]
       );
     } else {
@@ -4704,7 +4733,9 @@ const generateLabel = (scope, decl) => {
 const generateThrow = (scope, decl) => {
   scope.throws = true;
 
-  const exceptionMode = Prefs.exceptionMode ?? 'stack';
+  let exceptionMode = Prefs.exceptionMode ?? 'stack';
+  if (globalThis.precompile) exceptionMode = decl.argument.callee != null ? 'lut' : 'stack';
+
   if (exceptionMode === 'lut') {
     let message = decl.argument.value, constructor = null;
 
@@ -4730,7 +4761,7 @@ const generateThrow = (scope, decl) => {
 
     return [
       ...number(exceptId, Valtype.i32),
-      [ Opcodes.throw, tags[0].idx ]
+      [ Opcodes.throw, 0 ]
     ];
   }
 
@@ -4744,7 +4775,7 @@ const generateThrow = (scope, decl) => {
     return [
       ...generate(scope, decl.argument),
       ...getNodeType(scope, decl.argument),
-      [ Opcodes.throw, tags[0].idx ]
+      [ Opcodes.throw, globalThis.precompile ? 1 : 0 ]
     ];
   }
 };
@@ -5992,7 +6023,9 @@ const generateFunc = (scope, decl) => {
       if (decl.async) {
         // make out promise local
         allocVar(func, '#async_out_promise', false, false);
+
         func.async = true;
+        typeUsed(func, TYPES.promise);
       }
 
       const wasm = prelude.concat(generate(func, body));
@@ -6002,10 +6035,29 @@ const generateFunc = (scope, decl) => {
         wasm.unshift(
           [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_create').index ],
           [ Opcodes.drop ],
-          [ Opcodes.local_set, func.locals['#async_out_promise'].idx ]
+          [ Opcodes.local_set, func.locals['#async_out_promise'].idx ],
+
+          // wrap in try for later catch
+          [ Opcodes.try, Blocktype.void ]
         );
 
-        // todo: wrap in try and reject thrown value once supported
+        // reject with thrown value if caught error
+        wasm.push(
+          [ Opcodes.catch, 0 ],
+
+          [ Opcodes.local_get, func.locals['#async_out_promise'].idx ],
+          ...number(TYPES.promise, Valtype.i32),
+
+          [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_reject').index ],
+          [ Opcodes.drop ],
+          [ Opcodes.drop ],
+          [ Opcodes.end ],
+
+          // return promise at the end of func
+          [ Opcodes.local_get, func.locals['#async_out_promise'].idx ],
+          ...number(TYPES.promise, Valtype.i32),
+          [ Opcodes.return ]
+        );
       }
 
       if (name === 'main') {

package/compiler/precompile.js

@@ -25,7 +25,7 @@ const compile = async (file, _funcs) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--module', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data', '--exception-mode=lut'];
+  let args = ['--module', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--scoped-page-names', '--funsafe-no-unlikely-proto-checks', '--zero-checks=charCodeAt', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data'];
   if (first.startsWith('// @porf')) {
     args = first.slice('// @porf '.length).split(' ').concat(args);
   }
@@ -152,13 +152,16 @@ const compile = async (file, _funcs) => {
           y.splice(0, 10, 'alloc', pageName, x.pages.get(pageName).type, valtypeBinary);
         }
 
+        if (n[0] === Opcodes.throw) {
+          if (y[0] === Opcodes.i32_const && n[1] === 0) {
+            const id = read_signedLEB128(y.slice(1));
+            y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
 
-        if (y[0] === Opcodes.i32_const && n[0] === Opcodes.throw) {
-          const id = read_signedLEB128(y.slice(1));
-          y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
-
-          // remove throw inst
-          wasm.splice(i + 1, 1);
+            // remove throw inst
+            wasm.splice(i + 1, 1);
+          } else {
+            n[1]--;
+          }
         }
       }
     };

package/compiler/prototype.js

@@ -10,7 +10,7 @@ export const PrototypeFuncs = function() {
   const noUnlikelyChecks = Prefs.funsafeNoUnlikelyProtoChecks;
 
   let zeroChecks;
-  if (Prefs.zeroChecks) zeroChecks = Prefs.zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
+  if (Prefs.zeroChecks) zeroChecks = Prefs.zeroChecks.split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
     else zeroChecks = {};
 
   this[TYPES.array] = {

package/compiler/types.js

@@ -85,6 +85,8 @@ registerInternalType('SyntaxError');
 registerInternalType('RangeError');
 registerInternalType('EvalError');
 registerInternalType('URIError');
+registerInternalType('Test262Error');
+registerInternalType('__Porffor_TodoError');
 
 if (Prefs.largestTypes) {
   const typeKeys = Object.keys(TYPES);

package/compiler/wrap.js

@@ -312,10 +312,12 @@ ${flags & 0b0001 ? `    get func idx: ${get}
     case TYPES.syntaxerror:
     case TYPES.rangeerror:
     case TYPES.evalerror:
-    case TYPES.urierror: {
+    case TYPES.urierror:
+    case TYPES.test262error:
+    case TYPES.__porffor_todoerror: {
       const obj = porfToJSValue({ memory, funcs, pages }, value, TYPES.object);
-      const constr = globalThis[TYPE_NAMES[type]];
-      const err = new constr(obj.message);
+      const err = new (globalThis[TYPE_NAMES[type]] ?? Error)(obj.message);
+
       err.name = obj.name;
       err.stack = `${TYPE_NAMES[type]}: ${obj.message}`;
       return err;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.39.1+bd1e18648",
+  "version": "0.39.3+c13e1a532",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.39.1+bd1e18648';
+globalThis.version = '0.39.3+c13e1a532';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/runner/repl.js

@@ -111,7 +111,7 @@ const run = (source, _context, _filename, callback, run = true) => {
 
     prev = prev + ';\n' + source.trim();
   } catch (e) {
-    console.log('Uncaught', e.stack);
+    console.log('Uncaught', e.stack ? e.stack : e);
   }
 
   callback();