porffor 0.37.32 → 0.39.0

package/compiler/codegen.js

@@ -1523,6 +1523,7 @@ const countLeftover = wasm => {
         else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.f32_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
         else if (inst[0] === Opcodes.memory_copy[0] && (inst[1] === Opcodes.memory_copy[1] || inst[1] === Opcodes.memory_init[1])) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
+        else if (inst[0] === Opcodes.catch) count += 2;
         else if (inst[0] === Opcodes.call) {
           if (inst[1] < importedFuncs.length) {
             const func = importedFuncs[inst[1]];
@@ -4078,7 +4079,7 @@ const generateForOf = (scope, decl) => {
   let setVar;
   if (decl.left.type === 'Identifier') {
     if (scope.strict) return internalThrow(scope, 'ReferenceError', `${decl.left.name} is not defined`);
-    setVar = generateVarDstr(scope, decl.left.kind, decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
+    setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
   } else {
     // todo: verify this is correct
     const global = scope.name === 'main' && decl.left.kind === 'var';
@@ -4436,7 +4437,7 @@ const generateForIn = (scope, decl) => {
   let setVar;
   if (decl.left.type === 'Identifier') {
     if (scope.strict) return internalThrow(scope, 'ReferenceError', `${decl.left.name} is not defined`);
-    setVar = generateVarDstr(scope, decl.left.kind, decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
+    setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
   } else {
     // todo: verify this is correct
     const global = scope.name === 'main' && decl.left.kind === 'var';
@@ -4768,9 +4769,34 @@ const generateTry = (scope, decl) => {
     depth.pop();
     depth.push('catch');
 
-    out.push([ Opcodes.catch_all ]);
-    out.push(...generate(scope, decl.handler.body));
-    out.push(...finalizer);
+    const param = decl.handler.param;
+
+    if (param) {
+      let count = 0;
+      for (let i = 0; i < depth.length; i++) {
+        if (depth[i] === 'catch') count++;
+      }
+
+      const tmpName = '#catch_tmp' + count;
+      const tmp = localTmp(scope, tmpName, valtypeBinary);
+      localTmp(scope, tmpName + "#type", Valtype.i32);
+
+      // setup local for param
+      out.push(
+        [ Opcodes.catch, 0 ],
+        ...setType(scope, tmpName, []),
+        [ Opcodes.local_set, tmp ],
+
+        ...generateVarDstr(scope, 'let', param, { type: 'Identifier', name: tmpName }, undefined, false)
+      );
+    } else {
+      out.push([ Opcodes.catch_all ]);
+    }
+
+    out.push(
+      ...generate(scope, decl.handler.body),
+      ...finalizer
+    );
   }
 
   out.push([ Opcodes.end ]);

package/compiler/decompile.js

@@ -43,7 +43,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
       inst = [ [ inst[0], inst[1] ], ...inst.slice(2) ];
     }
 
-    if (depth > 0 && (inst[0] === Opcodes.end || inst[0] === Opcodes.else || inst[0] === Opcodes.catch_all)) depth--;
+    if (depth > 0 && (inst[0] === Opcodes.end || inst[0] === Opcodes.else || inst[0] === Opcodes.catch_all || inst[0] === Opcodes.catch)) depth--;
 
     out += ' '.repeat(Math.max(0, depth * 2));
 
@@ -70,7 +70,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
       return true;
     })
 
-    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else || inst[0] === Opcodes.try || inst[0] === Opcodes.catch_all) depth++;
+    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else || inst[0] === Opcodes.try || inst[0] === Opcodes.catch_all || inst[0] === Opcodes.catch) depth++;
 
     if (inst[0] === Opcodes.f64_const) {
       out += ` ${inst[1]}`;
@@ -89,7 +89,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
 
     if (comments.length > 0) out += ` ;; ${comments.join(' ')}`;
 
-    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else || inst[0] === Opcodes.try || inst[0] === Opcodes.catch_all) {
+    if (inst[0] === Opcodes.if || inst[0] === Opcodes.loop || inst[0] === Opcodes.block || inst[0] === Opcodes.else || inst[0] === Opcodes.try || inst[0] === Opcodes.catch_all || inst[0] === Opcodes.catch) {
       out += ` ;; label @${depth}`;
     }
 

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.32+fde2c20c4",
+  "version": "0.39.0+1c0b122a3",
   "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.32+fde2c20c4';
+globalThis.version = '0.39.0+1c0b122a3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {