porffor 0.37.28 → 0.37.30

package/compiler/codegen.js

@@ -32,7 +32,7 @@ const todo = (scope, msg, expectsValue = undefined) => {
       throw new TodoError(msg);
 
     case 'runtime':
-      return internalThrow(scope, 'TodoError', msg, expectsValue);
+      return internalThrow(scope, '__Porffor_TodoError', msg, expectsValue);
   }
 };
 
@@ -1735,7 +1735,7 @@ const createThisArg = (scope, decl) => {
   if (decl._new) {
     // if precompiling or builtin func, just make empty object
     if (globalThis.precompile || Object.hasOwn(builtinFuncs, name)) return [
-      ...makeObject(scope, {}),
+      ...number(NULL),
       ...number(TYPES.object, Valtype.i32)
     ];
 
@@ -1793,7 +1793,8 @@ const createThisArg = (scope, decl) => {
       ];
     }
 
-    // do not generate globalThis for builtins
+    // do not generate globalThis now,
+    // do it dynamically in generateThis in the func later
     return [
       ...number(NULL),
       ...number(TYPES.object, Valtype.i32)
@@ -4722,6 +4723,8 @@ const generateThrow = (scope, decl) => {
       idx: tags.length
     });
 
+    if (constructor && constructor.startsWith('__')) constructor = constructor.split('_').pop();
+
     let exceptId = exceptions.findIndex(x => x.constructor === constructor && x.message === message);
     if (exceptId === -1) exceptId = exceptions.push({ constructor, message }) - 1;
 
@@ -4747,61 +4750,6 @@ const generateThrow = (scope, decl) => {
       [ Opcodes.throw, tags[0].idx ]
     ];
   }
-
-  if (exceptionMode === 'stackest') {
-    let message = decl.argument, constructor = null;
-
-    // support `throw (new)? Error(...)`
-    if (message.type === 'NewExpression' || message.type === 'CallExpression') {
-      constructor = decl.argument.callee;
-      message = decl.argument.arguments[0];
-    }
-
-    message ??= DEFAULT_VALUE();
-
-    if (tags.length === 0) tags.push({
-      params: [ valtypeBinary, valtypeBinary, Valtype.i32 ],
-      results: [],
-      idx: tags.length
-    });
-
-    return [
-      ...(constructor == null ? number(-1) : generate(scope, constructor)),
-      ...generate(scope, message),
-      ...getNodeType(scope, message),
-      [ Opcodes.throw, tags[0].idx ]
-    ];
-  }
-
-  if (exceptionMode === 'partial') {
-    let message = decl.argument, constructor = null;
-
-    // support `throw (new)? Error(...)`
-    if (message.type === 'NewExpression' || message.type === 'CallExpression') {
-      constructor = decl.argument.callee.name;
-      message = decl.argument.arguments[0];
-    }
-
-    message ??= DEFAULT_VALUE();
-
-    if (tags.length === 0) tags.push({
-      params: [ Valtype.i32, valtypeBinary, Valtype.i32 ],
-      results: [],
-      idx: tags.length
-    });
-
-    let exceptId = exceptions.push({ constructor }) - 1;
-
-    scope.exceptions ??= [];
-    scope.exceptions.push(exceptId);
-
-    return [
-      ...number(exceptId, Valtype.i32),
-      ...generate(scope, message),
-      ...getNodeType(scope, message),
-      [ Opcodes.throw, tags[0].idx ]
-    ];
-  }
 };
 
 const generateTry = (scope, decl) => {
@@ -5975,6 +5923,18 @@ const generateFunc = (scope, decl) => {
     generate() {
       if (func.wasm) return func.wasm;
 
+      let errorWasm = null;
+      if (decl.generator) {
+        errorWasm = todo(func, 'generator functions are not supported');
+      }
+
+      if (errorWasm) {
+        return func.wasm = errorWasm.concat([
+          ...number(UNDEFINED),
+          ...number(TYPES.undefined, Valtype.i32)
+        ]);
+      }
+
       // generating, stub _wasm
       func.wasm = [];
 
@@ -6066,7 +6026,7 @@ const generateFunc = (scope, decl) => {
         // inject promise job runner func at the end of main if promises are made
         if (Object.hasOwn(funcIndex, 'Promise') || Object.hasOwn(funcIndex, '__Promise_resolve') || Object.hasOwn(funcIndex, '__Promise_reject')) {
           wasm.push(
-            [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_runJobs').index ],
+            [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_runJobs').index ],
             [ Opcodes.drop ],
             [ Opcodes.drop ]
           );
@@ -6085,17 +6045,6 @@ const generateFunc = (scope, decl) => {
   funcIndex[name] = func.index;
   funcs.push(func);
 
-  let errorWasm = null;
-  if (decl.generator) errorWasm = todo(scope, 'generator functions are not supported');
-
-  if (errorWasm) {
-    // func.params = [];
-    func.wasm = errorWasm.concat([
-      ...number(UNDEFINED),
-      ...number(TYPES.undefined, Valtype.i32)
-    ]);
-  }
-
   if (typedInput && decl.returnType) {
     const { type } = extractTypeAnnotation(decl.returnType);
     if (type != null && !Prefs.indirectCalls) {

package/compiler/wrap.js

@@ -524,38 +524,6 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
 
             throw porfToJSValue({ memory, funcs, pages }, value, type);
           }
-
-          if (exceptionMode === 'stackest') {
-            const constructorIdx = e.getArg(exceptTag, 0);
-            const constructorName = constructorIdx == -1 ? null : funcs.find(x => (x.index - importedFuncs.length) === constructorIdx)?.name;
-
-            const value = e.getArg(exceptTag, 1);
-            const type = e.getArg(exceptTag, 2);
-            const message = porfToJSValue({ memory, funcs, pages }, value, type);
-
-            // no constructor, just throw message
-            if (!constructorName) throw message;
-
-            const constructor = globalThis[constructorName] ?? eval(`class ${constructorName} extends Error { constructor(message) { super(message); this.name = "${constructorName}"; } }; ${constructorName}`);
-            throw new constructor(message);
-          }
-
-          if (exceptionMode === 'partial') {
-            const exceptId = e.getArg(exceptTag, 0);
-            const exception = exceptions[exceptId];
-
-            const constructorName = exception.constructor;
-
-            const value = e.getArg(exceptTag, 1);
-            const type = e.getArg(exceptTag, 2);
-            const message = porfToJSValue({ memory, funcs, pages }, value, type);
-
-            // no constructor, just throw message
-            if (!constructorName) throw message;
-
-            const constructor = globalThis[constructorName] ?? eval(`class ${constructorName} extends Error { constructor(message) { super(message); this.name = "${constructorName}"; } }; ${constructorName}`);
-            throw new constructor(message);
-          }
         }
 
         if (e instanceof WebAssembly.RuntimeError) {

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.37.28+2a5616118",
+  "version": "0.37.30+d663c99a2",
   "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.37.28+2a5616118';
+globalThis.version = '0.37.30+d663c99a2';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/runner/repl.js

@@ -88,36 +88,31 @@ const run = (source, _context, _filename, callback, run = true) => {
   let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source;
 
   let shouldPrint = !prev;
-  let exports, pages;
   try {
-    0, { exports, pages } = compile(toRun, process.argv.includes('--module') ? [ 'module' ] : [], {}, str => {
+    const { exports, pages } = compile(toRun, process.argv.includes('--module') ? [ 'module' ] : [], {}, str => {
       if (shouldPrint) process.stdout.write(str);
       if (str === '-4919') shouldPrint = true;
     });
-  } catch (e) {
-    console.log(e);
-    callback();
-    return;
-  }
 
-  if (run && exports.$) {
-    lastMemory = exports.$;
-    lastPages = [...pages.keys()];
-  }
-
-  let ret = run ? exports.main() : undefined;
-  let value, type;
-  if (ret?.type != null) {
-    value = ret.value;
-    type = ret.type;
-    ret = ret.js;
-  }
+    if (run && exports.$) {
+      lastMemory = exports.$;
+      lastPages = [...pages.keys()];
+    }
 
-  console.log(util.inspect(ret, false, 2, true), (value != null ? `\x1B[34m\x1B[3m(value: ${value}, type: ${TYPE_NAMES[type]})\x1B[0m` : ''));
+    let ret = run ? exports.main() : undefined;
+    let value, type;
+    if (ret?.type != null) {
+      value = ret.value;
+      type = ret.type;
+      ret = ret.js;
+    }
 
-  // callback(null, ret);
+    console.log(util.inspect(ret, false, 2, true), (value != null ? `\x1B[34m\x1B[3m(value: ${value}, type: ${TYPE_NAMES[type]})\x1B[0m` : ''));
 
-  prev = prev + ';\n' + source.trim();
+    prev = prev + ';\n' + source.trim();
+  } catch (e) {
+    console.log('Uncaught', e.stack);
+  }
 
   callback();
 };