porffor 0.58.16 → 0.58.18

package/compiler/codegen.js

@@ -1529,7 +1529,7 @@ const isExistingProtoFunc = name => {
 
 const getInferred = (scope, name, global = false) => {
   if (global) {
-    if (globalInfer.has(name)) return globalInfer.get(name);
+    if (globalInfer.has(name) && inferLoopPrev.length === 0) return globalInfer.get(name);
   } else if (scope.inferTree) {
     for (let i = scope.inferTree.length - 1; i >= 0; i--) {
       const x = scope.inferTree[i];

package/compiler/precompile.js

@@ -119,18 +119,18 @@ const compile = async (file, _funcs) => {
           const f = funcs.find(x => x.index === idx);
           if (!f) {
             if (idx < importedFuncs.length) {
-              y.splice(1, 10, importedFuncs[idx].name);
+              wasm[i] = [ Opcodes.call, importedFuncs[idx].name ];
             }
 
             continue;
           }
 
-          y.splice(1, 10, f.name);
+          wasm[i] = [ Opcodes.call, f.name ];
         }
 
         if (y[0] === Opcodes.global_get || y[0] === Opcodes.global_set) {
           const global = invGlobals[y[1]];
-          y.splice(0, 10, 'global', y[0], global.name, global.type);
+          wasm[i] = [ 'global', y[0], global.name, global.type ];
 
           if (!x.globalInits) {
             if (!main.rewrittenGlobalInits) {
@@ -147,7 +147,7 @@ const compile = async (file, _funcs) => {
 
         if (rewriteLocals && typeof y[1] === 'number' && (y[0] === Opcodes.local_get || y[0] === Opcodes.local_set || y[0] === Opcodes.local_tee)) {
           const local = locals[y[1]];
-          y.splice(1, 10, 'local', local.name, local.type);
+          wasm[i] = [ y[0], 'local', local.name, local.type ];
         }
 
         if (!n) continue;
@@ -161,7 +161,7 @@ const compile = async (file, _funcs) => {
           if (!pageName || allocated.has(pageName)) return;
           allocated.add(pageName);
 
-          y.splice(0, 10, 'alloc', pageName, valtypeBinary);
+          wasm[i] = [ 'alloc', pageName, valtypeBinary ];
         };
 
         if (y[0] === Opcodes.const &&(n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
@@ -177,7 +177,7 @@ const compile = async (file, _funcs) => {
           let id;
           if (y[0] === Opcodes.i32_const && n[1] === 0) {
             id = read_signedLEB128(y.slice(1));
-            y.splice(0, 10, 'throw', exceptions[id].constructor, exceptions[id].message);
+            wasm[i] = [ 'throw', exceptions[id].constructor, exceptions[id].message ];
 
             // remove throw inst
             wasm.splice(i + 1, 1);
@@ -249,7 +249,7 @@ ${funcs.map(x => {
       .replace(/\"local","(.*?)",(.*?)\]/g, (_, name, valtype) => `loc('${name}',${valtype})]`)
       .replace(/\[16,"(.*?)"]/g, (_, name) => `[16,builtin('${name}')]`)
       .replace(/\["funcref",(.*?),"(.*?)"]/g, (_1, op, name) => op === '65' ? `...i32ify(funcRef('${name}'))` : `...funcRef('${name}')`)
-      .replace(/\["str",(.*?),"(.*?)",(.*?)]/g, (_1, op, str, bytestring) => op === '65' ? `...i32ify(makeString(_,"${str}",${bytestring}))` : `...makeString(_,"${str}",${bytestring === 'true' ? 1 : 0})`)
+      .replace(/\["str",(.*?),"(.*?)",(.*?)]/g, (_1, op, str, bytestring) => op === '65' ? `...i32ify(makeString(_,"${str}",${bytestring === 'true' ? 1 : 0}))` : `...makeString(_,"${str}",${bytestring === 'true' ? 1 : 0})`)
       .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(_,'${constructor}',\`${message}\`)`)
       .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(_,{name:'${objName}'})`)
       .replace(/\[null,"typeswitch case start",\[(.*?)\]\],/g, (_, types) => `...t([${types}],()=>[`)

package/fuzz/generator.js

@@ -8,9 +8,17 @@ const generators = {
     return `(${num})`;
   },
   string: () => {
-    const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-    const len = Math.floor(Math.random() * 8) + 1;
-    return `'${Array.from({length: len}, () => chars[Math.floor(Math.random() * chars.length)]).join('')}'`;
+    if (Math.random() < 0.1) {
+      return `''`;
+    }
+
+    const len = Math.floor(Math.random() * 32) + 1;
+    if (Math.random() < 0.8) { // bytestring
+      const chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+      return `'${Array.from({length: len}, () => chars[Math.floor(Math.random() * chars.length)]).join('')}'`;
+    } else { // unicode string
+      return `'${Array.from({length: len}, () => `\\u${Math.floor(Math.random() * 0x10000).toString(16).padStart(4, '0')}`).join('')}'`;
+    }
   },
   boolean: () => Math.random() < 0.5 ? 'true' : 'false',
   null: () => 'null',
@@ -21,7 +29,7 @@ const generators = {
     if (depth > 2) return '[]';
     const len = Math.floor(Math.random() * 3);
     if (len === 0) return '[]';
-    const items = Array.from({length: len}, () => generateSimple());
+    const items = Array.from({ length: len }, () => generateExpression(depth + 1));
     return `[${items.join(', ')}]`;
   },
 
@@ -31,9 +39,12 @@ const generators = {
     const len = Math.floor(Math.random() * 3);
     if (len === 0) return '{}';
     const props = Array.from({length: len}, () => {
-      const key = String.fromCharCode(97 + Math.floor(Math.random() * 26));
-      // Ensure valid property syntax
-      return `'${key}': ${generateSimple()}`;
+      if (Math.random() < 0.5) {
+        const key = String.fromCharCode(97 + Math.floor(Math.random() * 26));
+        return `'${key}': ${generateExpression(depth + 1)}`;
+      } else {
+        return `[${generateExpression(depth + 1)}]: ${generateExpression(depth + 1)}`;
+      }
     });
     return `({${props.join(', ')}})`;
   },
@@ -63,27 +74,27 @@ function generateExpression(depth = 0) {
 
   const roll = Math.random();
 
-  if (roll < 0.4) {
+  if (roll < 0.3) {
     // Simple value
     return generateSimple();
-  } else if (roll < 0.6) {
+  } else if (roll < 0.4) {
     // Binary operation
     const ops = ['+', '-', '*', '/', '%', '===', '!==', '>', '<', '>=', '<=', '&&', '||'];
     const op = ops[Math.floor(Math.random() * ops.length)];
     return `(${generateExpression(depth + 1)} ${op} ${generateExpression(depth + 1)})`;
-  } else if (roll < 0.75) {
+  } else if (roll < 0.65) {
     // Unary operation
     const ops = ['!', '-', '+', 'typeof'];
     const op = ops[Math.floor(Math.random() * ops.length)];
     return `(${op} ${generateExpression(depth + 1)})`;
-  } else if (roll < 0.85) {
+  } else if (roll < 0.75) {
     // Function call
     const builtins = ['Math.abs', 'Math.floor', 'Math.ceil', 'String', 'Number', 'Boolean'];
     const func = builtins[Math.floor(Math.random() * builtins.length)];
     const argCount = Math.floor(Math.random() * 2);
     const args = Array.from({length: argCount}, () => generateExpression(depth + 1));
     return `${func}(${args.join(', ')})`;
-  } else if (roll < 0.95) {
+  } else if (roll < 0.85) {
     // Conditional
     return `(${generateExpression(depth + 1)} ? ${generateExpression(depth + 1)} : ${generateExpression(depth + 1)})`;
   } else {
@@ -105,10 +116,10 @@ function generateStatement(depth = 0, inFunction = false) {
   } else if (roll < 0.5 && declaredVars.length > 0) {
     // Variable assignment
     const varName = declaredVars[Math.floor(Math.random() * declaredVars.length)];
-    const ops = ['=', '+=', '-=', '*='];
+    const ops = ['=', '+=', '-=', '*=', '/=', '%=', '&=', '|=', '^=', '>>=', '>>>=', '<<='];
     const op = ops[Math.floor(Math.random() * ops.length)];
     return `${varName} ${op} ${generateExpression()};`;
-  } else if (roll < 0.65) {
+  } else if (roll < 0.6) {
     // If statement
     if (Math.random() < 0.5) {
       return `if (${generateExpression()}) { ${generateStatement(depth + 1, inFunction)} }`;
@@ -150,8 +161,7 @@ function generateFunction() {
     statements.push('  ' + generateStatement(0, true));
   }
 
-  // Always add a simple return to avoid syntax issues
-  statements.push('  return ' + generateSimple() + ';');
+  statements.push('  return ' + generateExpression() + ';');
 
   // Restore variables
   declaredVars = savedVars;
@@ -193,7 +203,7 @@ function generateProgram(options = {}) {
   }
 
   // Always end with a result
-  code += `var result = ${generateExpression()};\n`;
+  code += `var result = ${generateExpression()};`;
 
   return code;
 }

package/fuzz/index.js

@@ -17,8 +17,8 @@ if (cluster.isPrimary) {
   }
 
   const duration = parseFloat(process.argv.find(x => x.startsWith('--duration='))?.split('=')?.[1]) || 60; // seconds
-  const maxStatements = parseInt(process.argv.find(x => x.startsWith('--max-statements='))?.split('=')?.[1]) || 8;
-  const maxFunctions = parseInt(process.argv.find(x => x.startsWith('--max-functions='))?.split('=')?.[1]) || 2;
+  const maxStatements = parseInt(process.argv.find(x => x.startsWith('--max-statements='))?.split('=')?.[1]) || 20;
+  const maxFunctions = parseInt(process.argv.find(x => x.startsWith('--max-functions='))?.split('=')?.[1]) || 4;
   const verbose = process.argv.includes('--verbose');
   const saveFailures = process.argv.includes('--save-failures');
   const plainResults = process.argv.includes('--plain-results');
@@ -141,7 +141,17 @@ if (cluster.isPrimary) {
         const error = `${msg.error.name}: ${msg.error.message}`
           .replace(/\([0-9]+:[0-9]+\)/, '')
           .replace(/@\+[0-9]+/, '');
-        errorCounts.set(error, (errorCounts.get(error) || 0) + 1);
+
+        const count = errorCounts.get(error) || 0;
+        errorCounts.set(error, count + 1);
+
+        if (count === 0) {
+          const resultNames = ['PASS', 'TODO', 'WASM_ERROR', 'COMPILE_ERROR', 'FAIL', 'TIMEOUT', 'RUNTIME_ERROR'];
+          console.log('\n---');
+          console.log(`\x1b[4mNEW ${resultNames[result]}: ${error}\x1b[0m`);
+          console.log(msg.code);
+          console.log('---\n');
+        }
       }
 
       if (result === 0) {
@@ -262,7 +272,8 @@ if (cluster.isPrimary) {
     process.send({
       result,
       error: error ? { name: error.name, message: error.message } : null,
-      code: verbose || saveFailures ? code : null
+      // code: verbose || saveFailures ? code : null
+      code
     });
   });
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.58.16",
+  "version": "0.58.18",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

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