porffor 0.58.13 → 0.58.15

package/compiler/opt.js

@@ -22,12 +22,8 @@ export default (funcs, globals, pages, tags, exceptions) => {
     while (runs > 0) {
       runs--;
 
-      // main pass
       for (let i = 0; i < wasm.length; i++) {
-        let inst = wasm[i];
-        inst = [ ...inst ];
-        wasm[i] = inst;
-
+        const inst = wasm[i];
         if (inst[0] === Opcodes.block) {
           // remove unneeded blocks (no brs inside)
           // block
@@ -53,23 +49,22 @@ export default (funcs, globals, pages, tags, exceptions) => {
           if (!hasBranch) {
             wasm.splice(i, 1); // remove this inst (block)
             if (i > 0) i--;
-            inst = wasm[i];
 
             wasm.splice(j - 1, 1); // remove end of this block
 
             if (Prefs.optLog) log('opt', `removed unneeded block in for loop`);
+            continue;
           }
         }
 
         // remove setting last type if it is never gotten
         if (!f.internal && !f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType) {
           // replace this inst with drop
-          wasm.splice(i, 1, [ Opcodes.drop ]); // remove this and last inst
-          if (i > 0) i--;
+          wasm[i] = [ Opcodes.drop ];
         }
 
         if (i < 1) continue;
-        let lastInst = wasm[i - 1];
+        const lastInst = wasm[i - 1];
 
         if (lastInst[1] === inst[1] && lastInst[0] === Opcodes.local_set && inst[0] === Opcodes.local_get) {
           // replace set, get -> tee (sets and returns)
@@ -78,8 +73,8 @@ export default (funcs, globals, pages, tags, exceptions) => {
           // -->
           // local.tee 0
 
-          lastInst[0] = Opcodes.local_tee; // replace last inst opcode (set -> tee)
           wasm.splice(i, 1); // remove this inst (get)
+          wasm[i - 1] = [ Opcodes.local_tee, ...lastInst.slice(1) ]; // replace last inst opcode (set -> tee)
 
           i--;
           // if (Prefs.optLog) log('opt', `consolidated set, get -> tee`);
@@ -105,8 +100,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           // -->
           // local.set 0
 
-          lastInst[0] = Opcodes.local_set; // change last op
-
+          wasm[i - 1] = [ Opcodes.local_set, lastInst[1] ]; // change last op
           wasm.splice(i, 1); // remove this inst
           i--;
           continue;
@@ -131,7 +125,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           // -->
           // i32.eqz
 
-          inst[0] = Opcodes.eqz[0][0]; // eq -> eqz
+          wasm[i] = [ Opcodes.eqz[0][0] ]; // eq -> eqz
           wasm.splice(i - 1, 1); // remove const 0
           i--;
           continue;
@@ -213,7 +207,7 @@ export default (funcs, globals, pages, tags, exceptions) => {
           // -->
           // return_call X
 
-          lastInst[0] = Opcodes.return_call; // change last inst return -> return_call
+          wasm[i - 1] = [ Opcodes.return_call, ...lastInst.slice(1) ]; // change last inst return -> return_call
 
           wasm.splice(i, 1); // remove this inst (return)
           i--;

package/compiler/parse.js

@@ -36,6 +36,7 @@ export default input => {
       next: true,
       module: Prefs.module,
       webcompat: true,
+      raw: true,
 
       // babel
       plugins: types ? ['estree', 'typescript'] : ['estree'],
@@ -46,10 +47,11 @@ export default input => {
       ranges: false,
       tokens: false,
       comments: false,
+      preserveParens: false,
 
       // oxc
       lang: types ? 'ts' : 'js',
-      showSemanticErrors: true // sorry oxc pals but this default is bad
+      showSemanticErrors: true
     };
 
     let ast = parser === 'oxc-parser' ? parse('js', input, options) : parse(input, options);

package/compiler/precompile.js

@@ -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, forceBytestring) => op === '65' ? `...i32ify(makeString(_,"${str}",${forceBytestring ? 1 : 0}))` : `...makeString(_,"${str}",${forceBytestring ? 1 : 0})`)
+      .replace(/\["str",(.*?),"(.*?)",(.*?)]/g, (_1, op, str, bytestring) => op === '65' ? `...i32ify(makeString(_,"${str}",${bytestring}))` : `...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}],()=>[`)
@@ -284,7 +284,7 @@ params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.retu
 locals:${JSON.stringify(locals.slice(x.params.length).map(x => x[1].type))},localNames:${JSON.stringify(locals.map(x => x[0]))},
 ${x.globalInits ? `globalInits:{${Object.keys(x.globalInits).map(y => `${y}:${rewriteWasm(x.globalInits[y])}`).join(',')}},` : ''}${x.data && Object.keys(x.data).length > 0 ? `data:${JSON.stringify(x.data)},` : ''}
 ${x.table ? `table:1,` : ''}${x.constr ? `constr:1,` : ''}${x.hasRestArgument ? `hasRestArgument:1,` : ''}${x.usesTag ? `usesTag:1,` : ''}${x.usesImports ? `usesImports:1,` : ''}
-}`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
+}`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll(',\n}', '\n}');
 }).join('\n')}
 }`;
 };

package/compiler/prototype.js

@@ -14,54 +14,6 @@ export const PrototypeFuncs = function() {
     else zeroChecks = {};
 
   this[TYPES.array] = {
-    // lX = local accessor of X ({ get, set }), iX = local index of X, wX = wasm ops of X
-    at: ({ pointer, length, arg, iTmp, setType }) => [
-      ...arg,
-      Opcodes.i32_to,
-      [ Opcodes.local_tee, iTmp ],
-
-      // if index < 0: access index + array length
-      number(0, Valtype.i32),
-      [ Opcodes.i32_lt_s ],
-      [ Opcodes.if, Blocktype.void ],
-        [ Opcodes.local_get, iTmp ],
-        ...length.getCachedI32(),
-        [ Opcodes.i32_add ],
-        [ Opcodes.local_set, iTmp ],
-      [ Opcodes.end ],
-
-      // if still < 0 or >= length: return undefined
-      [ Opcodes.local_get, iTmp ],
-      number(0, Valtype.i32),
-      [ Opcodes.i32_lt_s ],
-
-      [ Opcodes.local_get, iTmp ],
-      ...length.getCachedI32(),
-      [ Opcodes.i32_ge_s ],
-      [ Opcodes.i32_or ],
-
-      [ Opcodes.if, Blocktype.void ],
-        number(UNDEFINED),
-        ...setType(TYPES.undefined),
-        [ Opcodes.br, 1 ],
-      [ Opcodes.end ],
-
-      [ Opcodes.local_get, iTmp ],
-      number(ValtypeSize[valtype] + 1, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...pointer,
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, iTmp ],
-
-      // read from memory
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.load, 0, ValtypeSize.i32 ],
-
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
-      ...setType()
-    ],
-
     pop: ({ pointer, length, iTmp, unusedValue, setType }) => [
       // if length == 0, noop
       ...length.getCachedI32(),
@@ -177,7 +129,6 @@ export const PrototypeFuncs = function() {
     ]
   };
 
-  this[TYPES.array].at.local = Valtype.i32;
   this[TYPES.array].pop.local = Valtype.i32;
 
   this[TYPES.string] = {

package/compiler/wrap.js

@@ -6,8 +6,6 @@ import './prefs.js';
 
 const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs')) : undefined);
 
-const checkOOB = (memory, ptr) => ptr >= memory.buffer.byteLength;
-
 let dv;
 const read = (ta, memory, ptr, length) => {
   if (ta === Uint8Array) return new Uint8Array(memory.buffer, ptr, length);
@@ -43,7 +41,7 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type, override = undefin
     case TYPES.booleanobject: return new Boolean(value);
 
     case TYPES.object: {
-      if (value === 0 || checkOOB(memory, value)) return null;
+      if (value === 0) return null;
 
       const size = read(Uint16Array, memory, value, 1)[0];
 

package/foo.js

@@ -0,0 +1,22 @@
+// (() => {
+// let y = Math.random();
+// let x = 0;
+// if (x === 0) {
+//   x = 1337;
+// } else {
+//   x = 42;
+// }
+// Porffor.log(x);
+// })()
+
+const fn = function() {}
+
+class C {
+  async *m() { return 42; } a; b = 42;
+  c = fn;
+
+}
+
+new C();
+
+console.log(Object.prototype.hasOwnProperty.call(C, "a"))

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.58.13",
+  "version": "0.58.15",
   "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.13';
+globalThis.version = '0.58.15';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {