porffor 0.2.0-6fd3f05 → 0.2.0-8f0a405

package/README.md

@@ -1,5 +1,5 @@
 # Porffor &nbsp;<sup><sub>/ˈpɔrfɔr/ &nbsp;*(poor-for)*</sup></sub>
-A from-scratch experimental **AOT** optimizing JS -> Wasm/C engine/compiler/runtime in JS. Not serious/intended for (real) use. (this is a straight forward, honest readme)<br>
+A from-scratch experimental **AOT** optimizing JS/TS -> Wasm/C engine/compiler/runtime in JS. Not serious/intended for (real) use. (this is a straight forward, honest readme)<br>
 Age: ~6 months (very on and off)
 
 ## Design
@@ -118,7 +118,7 @@ No particular order and no guarentees, just what could happen soon™
 - Objects
   - Basic object expressions (eg `{}`, `{ a: 0 }`)
 - Wasm
-  - *Basic* Wasm engine (interpreter) in js
+  - *Basic* Wasm engine (interpreter) in JS
 - More math operators (`**`, etc)
 - `do { ... } while (...)`
 - Rewrite `console.log` to work with strings/arrays
@@ -131,6 +131,14 @@ No particular order and no guarentees, just what could happen soon™
   - Smarter inline selection (snapshots?)
   - Remove const ifs (`if (true)`, etc)
   - Use type(script) information to remove unneeded typechecker code
+- Cool proposals
+  - [Optional Chaining Assignment](https://github.com/tc39/proposal-optional-chaining-assignment)
+  - [Modulus and Additional Integer Math](https://github.com/tc39/proposal-integer-and-modulus-math)
+  - [Array Equality](https://github.com/tc39/proposal-array-equality)
+  - [Declarations in Conditionals](https://github.com/tc39/proposal-Declarations-in-Conditionals)
+  - [Seeded Pseudo-Random Numbers](https://github.com/tc39/proposal-seeded-random)
+  - [`do` expressions](https://github.com/tc39/proposal-do-expressions)
+  - [String Trim Characters](https://github.com/Kingwl/proposal-string-trim-characters)
 
 ## Performance
 *For the things it supports most of the time*, Porffor is blazingly fast compared to most interpreters, and common engines running without JIT. For those with JIT, it is not that much slower like a traditional interpreter would be; mostly the same or a bit faster/slower depending on what.
@@ -180,7 +188,7 @@ Porffor can run Test262 via some hacks/transforms which remove unsupported featu
   - `wasmSpec.js`: "enums"/info from wasm spec
   - `wrap.js`: wrapper for compiler which instantiates and produces nice exports
 
-- `runner`: contains utils for running js with the compiler
+- `runner`: contains utils for running JS with the compiler
   - `index.js`: the main file, you probably want to use this
   - `info.js`: runs with extra info printed
   - `repl.js`: basic repl (uses `node:repl`)
@@ -212,11 +220,14 @@ You can also use Deno (`deno run -A ...` instead of `node ...`), or Bun (`bun ..
 - `-target=native` only:
   - `-compiler=clang` to set compiler binary (path/name) to use to compile
   - `-cO=O3` to set compiler opt argument
+- `-parser=acorn|@babel/parser|meriyah|hermes-parser` (default: `acorn`) to set which parser to use
+- `-parse-types` to enable parsing type annotations/typescript. if `-parser` is unset, changes default to `@babel/parser`. does not type check
+- `-opt-types` to perform optimizations using type annotations as compiler hints. does not type check
 - `-valtype=i32|i64|f64` (default: `f64`) to set valtype
 - `-O0` to disable opt
 - `-O1` (default) to enable basic opt (simplify insts, treeshake wasm imports)
-- `-O2` to enable advanced opt (inlining)
-- `-O3` to enable advanceder opt (precompute const math)
+- `-O2` to enable advanced opt (inlining). unstable
+- `-O3` to enable advanceder opt (precompute const math). unstable
 - `-no-run` to not run wasm output, just compile
 - `-opt-log` to log some opts
 - `-code-log` to log some codegen (you probably want `-funcs`)
@@ -230,20 +241,20 @@ You can also use Deno (`deno run -A ...` instead of `node ...`), or Bun (`bun ..
 - `-compile-hints` to enable V8 compilation hints (experimental + doesn't seem to do much?)
 
 ## VSCode extension
-There is a vscode extension in `porffor-for-vscode` which tweaks js syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
+There is a vscode extension in `porffor-for-vscode` which tweaks JS syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
 
 ## Isn't this the same as AssemblyScript/other Wasm langs?
 No. they are not alike at all internally and have very different goals/ideals:
 - Porffor is made as a generic JS engine, not for Wasm stuff specifically
-- Porffor takes in JS, not a different language or typescript
-- Porffor is made in pure JS and compiles itself, not using Binaryen/etc
+- Porffor primarily consumes JS
+- Porffor is written in pure JS and compiles itself, not using Binaryen/etc
 - (Also I didn't know it existed when I started this, lol)
 
 ## FAQ
 
 ### 1. Why the name?
 `purple` in Welsh is `porffor`. Why purple?
-- No other js engine is purple colored
+- No other JS engine is purple colored
 - Purple is pretty cool
 - Purple apparently represents "ambition", which is.. one word to describe this project
 - The hard to speak name is also the noise your brain makes in reaction to this idea!

package/compiler/2c.js

@@ -124,7 +124,7 @@ export default ({ funcs, globals, tags, exceptions, pages }) => {
     const returns = f.returns.length > 0;
 
     const shouldInline = f.internal;
-    out += `${f.name === 'main' ? 'int' : (f.internal ? 'double' : 'struct ReturnValue')} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
+    out += `${f.name === 'main' ? 'int' : (f.internal ? (returns ? 'double' : 'void') : 'struct ReturnValue')} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
 
     const localKeys = Object.keys(f.locals).sort((a, b) => f.locals[a].idx - f.locals[b].idx).slice(f.params.length).sort((a, b) => f.locals[a].idx - f.locals[b].idx);
     for (const x of localKeys) {
@@ -367,6 +367,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
       line(`return ${vals.pop()}`);
     }
 
+    if (f.name === 'main') {
+      out += '\n';
+      line(`return 0`);
+    }
+
     out += '}\n\n';
   }
 

package/compiler/codeGen.js

@@ -214,6 +214,11 @@ const generate = (scope, decl, global = false, name = undefined) => {
     }
 
     default:
+      if (decl.type.startsWith('TS')) {
+        // ignore typescript nodes
+        return [];
+      }
+
       return todo(`no generation for ${decl.type}!`);
   }
 };
@@ -360,12 +365,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
       ...right,
       // note type
       ...rightType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      setLastType(scope),
       [ Opcodes.else ],
       [ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
       // note type
       ...leftType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      setLastType(scope),
       [ Opcodes.end ],
       Opcodes.i32_from
     ];
@@ -379,12 +384,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     ...right,
     // note type
     ...rightType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    setLastType(scope),
     [ Opcodes.else ],
     [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
     // note type
     ...leftType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    setLastType(scope),
     [ Opcodes.end ]
   ];
 };
@@ -852,7 +857,16 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
 
   let tmpLeft, tmpRight;
   // if equal op, check if strings for compareStrings
-  if (op === '===' || op === '==' || op === '!==' || op === '!=') {
+  if (op === '===' || op === '==' || op === '!==' || op === '!=') (() => {
+    const knownLeft = knownType(scope, leftType);
+    const knownRight = knownType(scope, rightType);
+
+    // todo: intelligent partial skip later
+    // if neither known are string, stop this madness
+    if ((knownLeft != null && knownLeft !== TYPES.string) && (knownRight != null && knownRight !== TYPES.string)) {
+      return;
+    }
+
     tmpLeft = localTmp(scope, '__tmpop_left');
     tmpRight = localTmp(scope, '__tmpop_right');
 
@@ -902,7 +916,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
       // endOut.push(stringOnly([ Opcodes.end ]));
       endOut.unshift(stringOnly([ Opcodes.end ]));
     // }
-  }
+  })();
 
   return finalise([
     ...left,
@@ -1051,11 +1065,13 @@ const setType = (scope, _name, type) => {
 
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
+  if (typedInput && scope.locals[name]?.metadata?.type != null) return [];
   if (scope.locals[name]) return [
     ...out,
     [ Opcodes.local_set, scope.locals[name + '#type'].idx ]
   ];
 
+  if (typedInput && globals[name]?.metadata?.type != null) return [];
   if (globals[name]) return [
     ...out,
     [ Opcodes.global_set, globals[name + '#type'].idx ]
@@ -1064,6 +1080,15 @@ const setType = (scope, _name, type) => {
   // throw new Error('could not find var');
 };
 
+const getLastType = scope => {
+  scope.gotLastType = true;
+  return [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ];
+};
+
+const setLastType = scope => {
+  return [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ];
+};
+
 const getNodeType = (scope, node) => {
   const inner = () => {
     if (node.type === 'Literal') {
@@ -1092,7 +1117,19 @@ const getNodeType = (scope, node) => {
       if (builtinFuncs[name]) return TYPES[builtinFuncs[name].returnType ?? 'number'];
       if (internalConstrs[name]) return internalConstrs[name].type;
 
-      if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+      // check if this is a prototype function
+      // if so and there is only one impl (eg charCodeAt)
+      // use that return type as that is the only possibility
+      // (if non-matching type it would error out)
+      if (name.startsWith('__')) {
+        const spl = name.slice(2).split('_');
+
+        const func = spl[spl.length - 1];
+        const protoFuncs = Object.values(prototypeFuncs).filter(x => x[func] != null);
+        if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
+      }
+
+      if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
       // presume
       // todo: warn here?
@@ -1177,7 +1214,7 @@ const getNodeType = (scope, node) => {
       return TYPES.number;
     }
 
-    if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+    if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
     // presume
     // todo: warn here?
@@ -1356,13 +1393,13 @@ const generateCall = (scope, decl, _global, _name) => {
       const finalStatement = parsed.body[parsed.body.length - 1];
       out.push(
         ...getNodeType(scope, finalStatement),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       );
     } else if (countLeftover(out) === 0) {
       out.push(...number(UNDEFINED));
       out.push(
         ...number(TYPES.undefined, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       );
     }
 
@@ -1380,8 +1417,7 @@ const generateCall = (scope, decl, _global, _name) => {
   if (name && name.startsWith('__')) {
     const spl = name.slice(2).split('_');
 
-    const func = spl[spl.length - 1];
-    protoName = func;
+    protoName = spl[spl.length - 1];
 
     target = { ...decl.callee };
     target.name = spl.slice(0, -1).join('_');
@@ -1407,12 +1443,11 @@ const generateCall = (scope, decl, _global, _name) => {
         Opcodes.i32_from_u,
 
         ...number(TYPES.boolean, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       ];
     }
 
-    const func = decl.callee.property.name;
-    protoName = func;
+    protoName = decl.callee.property.name;
 
     target = decl.callee.object;
   }
@@ -1457,7 +1492,7 @@ const generateCall = (scope, decl, _global, _name) => {
             ...RTArrayUtil.getLength(getPointer),
 
             ...number(TYPES.number, Valtype.i32),
-            [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+            setLastType(scope)
           ];
           continue;
         }
@@ -1488,7 +1523,7 @@ const generateCall = (scope, decl, _global, _name) => {
           ...protoOut,
 
           ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
-          [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+          setLastType(scope),
           [ Opcodes.end ]
         ];
       }
@@ -1589,7 +1624,7 @@ const generateCall = (scope, decl, _global, _name) => {
     //   ...number(type, Valtype.i32),
     //   [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
     // );
-  } else out.push([ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]);
+  } else out.push(setLastType(scope));
 
   return out;
 };
@@ -1614,7 +1649,28 @@ const unhackName = name => {
   return name;
 };
 
+const knownType = (scope, type) => {
+  if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
+    return type[0][1];
+  }
+
+  if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
+    const idx = type[0][1];
+
+    // type idx = var idx + 1
+    const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
+    if (v.metadata?.type != null) return v.metadata.type;
+  }
+
+  return null;
+};
+
 const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
+  const known = knownType(scope, type);
+  if (known != null) {
+    return bc[known] ?? bc.default;
+  }
+
   const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
 
   const out = [
@@ -1668,6 +1724,49 @@ const allocVar = (scope, name, global = false) => {
   return idx;
 };
 
+const addVarMetadata = (scope, name, global = false, metadata = {}) => {
+  const target = global ? globals : scope.locals;
+
+  target[name].metadata ??= {};
+  for (const x in metadata) {
+    if (metadata[x] != null) target[name].metadata[x] = metadata[x];
+  }
+};
+
+const typeAnnoToPorfType = x => {
+  if (TYPES[x]) return TYPES[x];
+  if (TYPES['_' + x]) return TYPES['_' + x];
+
+  switch (x) {
+    case 'i32':
+      return TYPES.number;
+  }
+
+  return null;
+};
+
+const extractTypeAnnotation = decl => {
+  let a = decl;
+  while (a.typeAnnotation) a = a.typeAnnotation;
+
+  let type, elementType;
+  if (a.typeName) {
+    type = a.typeName.name;
+  } else if (a.type.endsWith('Keyword')) {
+    type = a.type.slice(2, -7).toLowerCase();
+  } else if (a.type === 'TSArrayType') {
+    type = 'array';
+    elementType = extractTypeAnnotation(a.elementType).type;
+  }
+
+  const typeName = type;
+  type = typeAnnoToPorfType(type);
+
+  // if (decl.name) console.log(decl.name, { type, elementType });
+
+  return { type, typeName, elementType };
+};
+
 const generateVar = (scope, decl) => {
   let out = [];
 
@@ -1695,6 +1794,11 @@ const generateVar = (scope, decl) => {
     }
 
     let idx = allocVar(scope, name, global);
+
+    if (typedInput && x.id.typeAnnotation) {
+      addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
+    }
+
     if (x.init) {
       out = out.concat(generate(scope, x.init, global, name));
 
@@ -1858,7 +1962,7 @@ const generateAssign = (scope, decl) => {
       ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
 
-      [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ],
+      getLastType(scope),
       // hack: type is idx+1
       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
     ];
@@ -2025,7 +2129,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.consequent),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    setLastType(scope)
   );
 
   out.push([ Opcodes.else ]);
@@ -2034,7 +2138,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.alternate),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    setLastType(scope)
   );
 
   out.push([ Opcodes.end ]);
@@ -2478,7 +2582,7 @@ export const generateMember = (scope, decl, _global, _name) => {
 
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
-  let newOut = number(0, Valtype.f64), newPointer = -1;
+  let newOut = number(0, valtypeBinary), newPointer = -1;
   if (pages.hasString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
@@ -2505,7 +2609,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
 
       ...number(TYPES.number, Valtype.i32),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      setLastType(scope)
     ],
 
     [TYPES.string]: [
@@ -2537,7 +2641,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       ...number(newPointer),
 
       ...number(TYPES.string, Valtype.i32),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      setLastType(scope)
     ],
 
     default: [ [ Opcodes.unreachable ] ]
@@ -2586,7 +2690,7 @@ const generateFunc = (scope, decl) => {
   if (decl.generator) return todo('generator functions are not supported');
 
   const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
-  const params = decl.params?.map(x => x.name) ?? [];
+  const params = decl.params ?? [];
 
   // const innerScope = { ...scope };
   // TODO: share scope/locals between !!!
@@ -2600,7 +2704,11 @@ const generateFunc = (scope, decl) => {
   };
 
   for (let i = 0; i < params.length; i++) {
-    allocVar(innerScope, params[i], false);
+    allocVar(innerScope, params[i].name, false);
+
+    if (typedInput && params[i].typeAnnotation) {
+      addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
+    }
   }
 
   let body = objectHack(decl.body);
@@ -2639,117 +2747,6 @@ const generateFunc = (scope, decl) => {
     );
   }
 
-  // change v128 params into many <type> (i32x4 -> i32/etc) instead as unsupported param valtype
-  let offset = 0, vecParams = 0;
-  for (let i = 0; i < params.length; i++) {
-    const name = params[i];
-    const local = func.locals[name];
-    if (local.type === Valtype.v128) {
-      vecParams++;
-
-      /* wasm.unshift( // add v128 load for param
-        [ Opcodes.i32_const, 0 ],
-        [ ...Opcodes.v128_load, 0, i * 16 ],
-        [ Opcodes.local_set, local.idx ]
-      ); */
-
-      // using params and replace_lane is noticably faster than just loading from memory (above) somehow
-
-      // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-      const { vecType } = local;
-      let [ type, lanes ] = vecType.split('x');
-      if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-      lanes = parseInt(lanes);
-      type = Valtype[type];
-
-      const name = params[i]; // get original param name
-
-      func.params.splice(offset, 1, ...new Array(lanes).fill(type)); // add new params of {type}, {lanes} times
-
-      // update index of original local
-      // delete func.locals[name];
-
-      // add new locals for params
-      for (let j = 0; j < lanes; j++) {
-        func.locals[name + j] = { idx: offset + j, type, vecParamAutogen: true };
-      }
-
-      // prepend wasm to generate expected v128 locals
-      wasm.splice(i * 2 + offset * 2, 0,
-        ...i32x4(0, 0, 0, 0),
-        ...new Array(lanes).fill(0).flatMap((_, j) => [
-          [ Opcodes.local_get, offset + j ],
-          [ ...Opcodes[vecType + '_replace_lane'], j ]
-        ]),
-        [ Opcodes.local_set, i ]
-      );
-
-      offset += lanes;
-
-      // note: wrapping is disabled for now due to perf/dx concerns (so this will never run)
-      /* if (!func.name.startsWith('#')) func.name = '##' + func.name;
-
-      // add vec type index to hash name prefix for wrapper to know how to wrap
-      const vecTypeIdx = [ 'i8x16', 'i16x8', 'i32x4', 'i64x2', 'f32x4', 'f64x2' ].indexOf(local.vecType);
-      const secondHash = func.name.slice(1).indexOf('#');
-      func.name = '#' + func.name.slice(1, secondHash) + vecTypeIdx + func.name.slice(secondHash); */
-    }
-  }
-
-  if (offset !== 0) {
-    // bump local indexes for all other locals after
-    for (const x in func.locals) {
-      const local = func.locals[x];
-      if (!local.vecParamAutogen) local.idx += offset;
-    }
-
-    // bump local indexes in wasm local.get/set
-    for (let j = 0; j < wasm.length; j++) {
-      const inst = wasm[j];
-      if (j < offset * 2 + vecParams * 2) {
-        if (inst[0] === Opcodes.local_set) inst[1] += offset;
-        continue;
-      }
-
-      if (inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) inst[1] += offset;
-    }
-  }
-
-  // change v128 return into many <type> instead as unsupported return valtype
-  const lastReturnLocal = wasm.length > 2 && wasm[wasm.length - 1][0] === Opcodes.return && Object.values(func.locals).find(x => x.idx === wasm[wasm.length - 2][1]);
-  if (lastReturnLocal && lastReturnLocal.type === Valtype.v128) {
-    const name = Object.keys(func.locals)[Object.values(func.locals).indexOf(lastReturnLocal)];
-    // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-    const { vecType } = lastReturnLocal;
-    let [ type, lanes ] = vecType.split('x');
-    if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-    lanes = parseInt(lanes);
-    type = Valtype[type];
-
-    const vecIdx = lastReturnLocal.idx;
-
-    const lastIdx = Math.max(0, ...Object.values(func.locals).map(x => x.idx));
-    const tmpIdx = [];
-    for (let i = 0; i < lanes; i++) {
-      const idx = lastIdx + i + 1;
-      tmpIdx.push(idx);
-      func.locals[name + i] = { idx, type, vecReturnAutogen: true };
-    }
-
-    wasm.splice(wasm.length - 1, 1,
-      ...new Array(lanes).fill(0).flatMap((_, i) => [
-        i === 0 ? null : [ Opcodes.local_get, vecIdx ],
-        [ ...Opcodes[vecType + '_extract_lane'], i ],
-        [ Opcodes.local_set, tmpIdx[i] ],
-      ].filter(x => x !== null)),
-      ...new Array(lanes).fill(0).map((_, i) => [ Opcodes.local_get, tmpIdx[i]])
-    );
-
-    func.returns = new Array(lanes).fill(type);
-  }
-
   func.wasm = wasm;
 
   funcs.push(func);

package/compiler/opt.js

@@ -103,6 +103,8 @@ export default (funcs, globals, pages) => {
   for (const f of funcs) {
     const wasm = f.wasm;
 
+    const lastType = f.locals['#last_type'];
+
     let runs = 2; // how many by default? add arg?
     while (runs > 0) {
       runs--;
@@ -221,6 +223,7 @@ export default (funcs, globals, pages) => {
           }
 
           if (checks === 0) {
+            // todo: review indexes below
             wasm.splice(j - 1, 2, [ Opcodes.drop ]); // remove typeswitch start
             wasm.splice(i - 1, 1); // remove this inst
 
@@ -231,6 +234,13 @@ export default (funcs, globals, pages) => {
           }
         }
 
+        // remove setting last type if it is never gotten
+        if (!f.gotLastType && inst[0] === Opcodes.local_set && inst[1] === lastType?.idx) {
+          // replace this inst with drop
+          wasm.splice(i, 1, [ Opcodes.drop ]); // remove this and last inst
+          if (i > 0) i--;
+        }
+
         if (i < 1) continue;
         let lastInst = wasm[i - 1];
 

package/compiler/parse.js

@@ -1,4 +1,5 @@
 import { log } from "./log.js";
+// import { parse } from 'acorn';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -6,16 +7,9 @@ if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
   globalThis.process = { argv: ['', '', ...Deno.args], stdout: { write: str => Deno.writeAllSync(Deno.stdout, textEncoder.encode(str)) } };
 }
 
-// import { parse } from 'acorn';
-
-let parser, parse;
-
-const loadParser = async () => {
-  parser = process.argv.find(x => x.startsWith('-parser='))?.split('=')?.[1] ?? 'acorn';
-  0, { parse } = (await import((globalThis.document ? 'https://esm.sh/' : '') + parser));
-};
-globalThis._porf_loadParser = loadParser;
-await loadParser();
+// should we try to support types (while parsing)
+const types = process.argv.includes('-parse-types');
+globalThis.typedInput = types && process.argv.includes('-opt-types');
 
 // todo: review which to use by default
 // supported parsers:
@@ -24,8 +18,13 @@ await loadParser();
 // - hermes-parser
 // - @babel/parser
 
-// should we try to support types (while parsing)
-const types = process.argv.includes('-types');
+let parser, parse;
+const loadParser = async (fallbackParser = 'acorn', forceParser) => {
+  parser = forceParser ?? process.argv.find(x => x.startsWith('-parser='))?.split('=')?.[1] ?? fallbackParser;
+  0, { parse } = (await import((globalThis.document ? 'https://esm.sh/' : '') + parser));
+};
+globalThis._porf_loadParser = loadParser;
+await loadParser(types ? '@babel/parser' : undefined);
 
 if (types && !['@babel/parser', 'hermes-parser'].includes(parser)) log.warning('parser', `passed -types with a parser (${parser}) which does not support`);
 

package/compiler/sections.js

@@ -150,7 +150,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
       if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-      return encodeVector([ ...encodeVector(localDecl), ...x.wasm.flat().filter(x => x <= 0xff), Opcodes.end ]);
+      return encodeVector([ ...encodeVector(localDecl), ...x.wasm.flat().filter(x => x != null && x <= 0xff), Opcodes.end ]);
     }))
   );
 

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.2.0-6fd3f05",
+  "version": "0.2.0-8f0a405",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/runner/repl.js

@@ -45,9 +45,9 @@ let prev = '';
 const run = async (source, _context, _filename, callback, run = true) => {
   // hack: print "secret" before latest code ran to only enable printing for new code
 
-  let toRun = prev + `;\nprint(-0x1337);\n` + source.trim();
+  let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source.trim();
 
-  let shouldPrint = false;
+  let shouldPrint = !prev;
   const { exports, wasm, pages } = await compile(toRun, [], {}, str => {
     if (shouldPrint) process.stdout.write(str);
     if (str === '-4919') shouldPrint = true;

package/tmp.c

@@ -1,69 +0,0 @@
-
-#include <stdio.h>
-
-struct ReturnValue {
-  double value;
-  long type;
-};
-
-double sum = 0;
-long sumdtype = 0;
-double counter = 0;
-long counterdtype = 0;
-
-double inline f64_f(double x, double y) {
-  return (x - ((int)(x / y) * y));
-}
-
-struct ReturnValue isPrime(double number, long numberdtype) {
-  double i = 0;
-  long idtype = 0;
-  double __tmpop_left = 0;
-  double __tmpop_right = 0;
-  long compare_left_pointer = 0;
-  long compare_left_length = 0;
-  long compare_right_pointer = 0;
-  long compare_right_length = 0;
-  long compare_index = 0;
-  long compare_index_end = 0;
-
-  if (number < 2e+0) {
-    return (struct ReturnValue){ 1, 0e+0 };
-  }
-  i = 2e+0;
-  idtype = 0;
-  while (i < number) {
-    if (f64_f(number, i) == 0e+0) {
-      return (struct ReturnValue){ 1, 0e+0 };
-    }
-    i = i + 1e+0;
-  }
-  return (struct ReturnValue){ 1, 1e+0 };
-}
-
-double inline __console_log(double x) {
-  printf("%f\n", x);
-  printf("%c", (int)(1e+1));
-}
-
-int main() {
-  long dlast_type = 0;
-  double elogicinner_tmp = 0;
-  long dtypeswitch_tmp = 0;
-
-  sum = 0e+0;
-  sumdtype = 0;
-  counter = 0e+0;
-  counterdtype = 0;
-  while (counter <= 1e+5) {
-    const struct ReturnValue _ = isPrime(counter, counterdtype);
-    dlast_type = _.type;
-    if ((unsigned long)(elogicinner_tmp = _.value) == 1e+0) {
-      sum = sum + counter;
-      sumdtype = 0;
-    }
-    counter = counter + 1e+0;
-  }
-  __console_log(sum);
-}
-