porffor 0.42.5 → 0.42.7

package/compiler/builtins/math.ts

@@ -279,7 +279,7 @@ export const __Math_cbrt = (y: number): number => {
   if (!Number.isFinite(y)) return y;
 
   // Babylonian method
-  let x = Math.abs(y);
+  let x:number = Math.abs(y);
 
   let prev: number;
 

package/compiler/builtins_precompiled.js

@@ -1780,9 +1780,9 @@ params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
 locals:[124,124],localNames:["y","y#type","x","prev"],
 }
 this.__Math_cbrt = {
-wasm:(_,{builtin})=>[[32,0],[68,0],[97],[4,64],[68,0],[65,1],[15],[11],[32,0],[16,builtin('__Number_isFinite')],[68,0],[97],[4,64],[32,0],[65,1],[15],[11],[32,0],[16,builtin('__Math_abs')],[33,2],[65,1],[33,3],[3,64],[2,64],[32,2],[33,4],[68,2],[32,2],[162],[32,0],[32,2],[32,2],[162],[163],[160],[68,3],[163],[34,2],[65,1],[33,3],[26],[32,4],[32,2],[161],[16,builtin('__Math_abs')],[68,1e-15],[100],[13,1],[11],[11],[32,0],[68,0],[99],[4,124],[32,2],[154],[65,1],[33,5],[5],[32,2],[32,3],[33,5],[11],[32,5],[15]],
+wasm:(_,{builtin})=>[[32,0],[68,0],[97],[4,64],[68,0],[65,1],[15],[11],[32,0],[16,builtin('__Number_isFinite')],[68,0],[97],[4,64],[32,0],[65,1],[15],[11],[32,0],[16,builtin('__Math_abs')],[33,2],[3,64],[2,64],[32,2],[33,3],[68,2],[32,2],[162],[32,0],[32,2],[32,2],[162],[163],[160],[68,3],[163],[33,2],[32,3],[32,2],[161],[16,builtin('__Math_abs')],[68,1e-15],[100],[13,1],[11],[11],[32,0],[68,0],[99],[4,124],[32,2],[154],[65,1],[33,4],[5],[32,2],[65,1],[33,4],[11],[32,4],[15]],
 params:[124,127],typedParams:1,returns:[124,127],typedReturns:1,
-locals:[124,127,124,127],localNames:["y","y#type","x","x#type","prev","#last_type"],
+locals:[124,124,127],localNames:["y","y#type","x","prev","#last_type"],
 }
 this.__Math_hypot = {
 wasm:(_,{builtin})=>[[32,0],[32,0],[162],[32,2],[32,2],[162],[160],[65,1],[16,builtin('__Math_sqrt')],[34,4],[15]],

package/compiler/codegen.js

@@ -1340,8 +1340,12 @@ const setType = (scope, name, type) => {
 };
 
 const getLastType = scope => {
+  if (!scope.locals['#last_type']) return number(TYPES.number, Valtype.i32);
+
   scope.gotLastType = true;
-  return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+  return [
+    [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ]
+  ];
 };
 
 const setLastType = (scope, type = []) => {
@@ -1388,11 +1392,7 @@ const getNodeType = (scope, node) => {
 
       if (name == null) {
         // iife
-        if (scope.locals['#last_type']) return getLastType(scope);
-
-        // presume
-        if (Prefs.warnAssumedType) console.warn(`Indirect call assumed to be number`);
-        return TYPES.number;
+        return getLastType(scope);
       }
 
       const func = funcByName(name);
@@ -1426,38 +1426,7 @@ const getNodeType = (scope, node) => {
         return TYPES.number;
       }
 
-      if (scope.locals['#last_type']) return getLastType(scope);
-
-      // presume
-      if (Prefs.warnAssumedType) console.warn(`Call to ${name} assumed to be number`);
-      return TYPES.number;
-
-      // let protoFunc;
-      // // ident.func()
-      // if (name && name.startsWith('__')) {
-      //   const spl = name.slice(2).split('_');
-
-      //   const baseName = spl.slice(0, -1).join('_');
-      //   const baseType = getType(scope, baseName);
-
-      //   const func = spl[spl.length - 1];
-      //   protoFunc = prototypeFuncs[baseType]?.[func];
-      // }
-
-      // // literal.func()
-      // if (!name && node.callee.type === 'MemberExpression') {
-      //   if (node.callee.object.regex) {
-      //     const funcName = node.callee.property.name;
-      //     return Rhemyn[funcName] ? TYPES.boolean : TYPES.undefined;
-      //   }
-
-      //   const baseType = getNodeType(scope, node.callee.object);
-
-      //   const func = node.callee.property.name;
-      //   protoFunc = prototypeFuncs[baseType]?.[func];
-      // }
-
-      // if (protoFunc) return protoFunc.returnType;
+      return getLastType(scope);
     }
 
     if (node.type === 'ExpressionStatement') {
@@ -1505,10 +1474,7 @@ const getNodeType = (scope, node) => {
       if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
         guess = TYPES.bytestring;
 
-      if (scope.locals['#last_type']) return getLastType(scope);
-
-      // presume
-      return TYPES.number;
+      return getLastType(scope);
     }
 
     if (node.type === 'UnaryExpression') {
@@ -1542,11 +1508,7 @@ const getNodeType = (scope, node) => {
         }
       }
 
-      if (scope.locals['#last_type']) return getLastType(scope);
-
-      // presume
-      if (Prefs.warnAssumedType) console.warn(`Member access to field .${name} assumed to be number`);
-      return TYPES.number;
+      return getLastType(scope);
     }
 
     if (node.type === 'TemplateLiteral') {
@@ -1579,11 +1541,7 @@ const getNodeType = (scope, node) => {
       }
     }
 
-    if (scope.locals['#last_type']) return getLastType(scope);
-
-    // presume
-    if (Prefs.warnAssumedType) console.warn(`AST node ${node.type} assumed to be number`);
-    return TYPES.number;
+    return getLastType(scope);
   })();
 
   const out = typeof ret === 'number' ? number(ret, Valtype.i32) : ret;
@@ -2447,6 +2405,31 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     paramOffset += 4;
   }
 
+  if (args.at(-1)?.type === 'SpreadElement') {
+    // hack: support spread element if last by doing essentially:
+    // const foo = (a, b, c, d) => ...
+    // foo(a, b, ...c) -> _ = c; foo(a, b, _[0], _[1])
+    const arg = args.at(-1).argument;
+    out.push(
+      ...generate(scope, arg),
+      [ Opcodes.local_set, localTmp(scope, '#spread') ],
+      ...getNodeType(scope, arg),
+      [ Opcodes.local_set, localTmp(scope, '#spread#type', Valtype.i32) ]
+    );
+
+    args.pop();
+    const leftover = paramCount - args.length;
+    for (let i = 0; i < leftover; i++) {
+      args.push({
+        type: 'MemberExpression',
+        object: { type: 'Identifier', name: '#spread' },
+        property: { type: 'Literal', value: i },
+        computed: true,
+        optional: false
+      });
+    }
+  }
+
   if (func && args.length < paramCount) {
     // too little args, push undefineds
     args = args.concat(new Array(paramCount - (func.hasRestArgument ? 1 : 0) - args.length).fill(DEFAULT_VALUE()));
@@ -3689,6 +3672,11 @@ const ifIdentifierErrors = (scope, decl) => {
 const generateUnary = (scope, decl) => {
   switch (decl.operator) {
     case '+':
+      // opt: skip ToNumber if already known as number type
+      generate(scope, decl.argument); // hack: fix last type not being defined for getNodeType before generation
+      const known = knownType(scope, getNodeType(scope, decl.argument));
+      if (known === TYPES.number) return generate(scope, decl.argument);
+
       // 13.5.4 Unary + Operator, 13.5.4.1 Runtime Semantics: Evaluation
       // https://tc39.es/ecma262/#sec-unary-plus-operator-runtime-semantics-evaluation
       // 1. Let expr be ? Evaluation of UnaryExpression.
@@ -3705,7 +3693,7 @@ const generateUnary = (scope, decl) => {
       });
 
     case '-':
-      // * -1
+      // +x * -1
 
       if (decl.prefix && decl.argument.type === 'Literal' && typeof decl.argument.value === 'number') {
         // if -n, just return that as a const
@@ -3713,7 +3701,12 @@ const generateUnary = (scope, decl) => {
       }
 
       return [
-        ...generate(scope, decl.argument),
+        ...generate(scope, {
+          type: 'UnaryExpression',
+          operator: '+',
+          prefix: true,
+          argument: decl.argument
+        }),
         ...(valtype === 'f64' ? [ [ Opcodes.f64_neg ] ] : [ ...number(-1), [ Opcodes.mul ] ])
       ];
 
@@ -3729,7 +3722,12 @@ const generateUnary = (scope, decl) => {
 
     case '~':
       return [
-        ...generate(scope, decl.argument),
+        ...generate(scope, {
+          type: 'UnaryExpression',
+          operator: '+',
+          prefix: true,
+          argument: decl.argument
+        }),
         Opcodes.i32_to,
         [ Opcodes.i32_const, ...signedLEB128(-1) ],
         [ Opcodes.i32_xor ],
@@ -3821,33 +3819,62 @@ const generateUnary = (scope, decl) => {
 
 const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
   const { name } = decl.argument;
-
   const [ local, isGlobal ] = lookupName(scope, name);
+  if (local != null) {
+    // fast path: just a local
+    // todo: not as compliant as slow path (non numbers)
+    const idx = local.idx;
+    const out = [];
+
+    out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+    if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+
+    switch (decl.operator) {
+      case '++':
+        out.push(...number(1), [ Opcodes.add ]);
+        break;
 
-  if (local === undefined) {
-    return todo(scope, `update expression with undefined variable`, true);
-  }
-
-  const idx = local.idx;
-  const out = [];
-
-  out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
-  if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+      case '--':
+        out.push(...number(1), [ Opcodes.sub ]);
+        break;
+    }
 
-  switch (decl.operator) {
-    case '++':
-      out.push(...number(1), [ Opcodes.add ]);
-      break;
+    out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
+    if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
 
-    case '--':
-      out.push(...number(1), [ Opcodes.sub ]);
-      break;
+    return out;
   }
 
-  out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
-  if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+  // ++x: tmp = +x; x = tmp + 1
+  // x++: tmp = +x; x = tmp + 1; tmp
+  const tmp = localTmp(scope, '#updatetmp');
+  addVarMetadata(scope, '#updatetmp', false, { type: TYPES.number });
 
-  return out;
+  return [
+    // tmp = +x
+    // if postfix, tee to keep on stack as return value
+    ...generate(scope, {
+      type: 'UnaryExpression',
+      operator: '+',
+      prefix: true,
+      argument: decl.argument
+    }),
+    [ decl.prefix ? Opcodes.local_set : Opcodes.local_tee, tmp ],
+
+    // x = tmp + 1
+    ...generate(scope, {
+      type: 'AssignmentExpression',
+      operator: '=',
+      left: decl.argument,
+      right: {
+        type: 'BinaryExpression',
+        operator: decl.operator[0],
+        left: { type: 'Identifier', name: '#updatetmp' },
+        right: { type: 'Literal', value: 1 }
+      }
+    }),
+    ...(decl.prefix ? [] : [ [ Opcodes.drop ] ])
+  ];
 };
 
 const generateIf = (scope, decl) => {

package/compiler/wrap.js

@@ -320,7 +320,7 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       const err = new (globalThis[TYPE_NAMES[type]] ?? Error)(obj.message);
 
       err.name = obj.name;
-      err.stack = `${TYPE_NAMES[type]}: ${obj.message}`;
+      err.stack = `${obj.name}: ${obj.message}`;
       return err;
     }
 

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.42.5+a3af054f9",
+  "version": "0.42.7+5472762e8",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/r.js

@@ -0,0 +1,4 @@
+const foo = (a, b, c, d) => console.log(a, b, c, d);
+
+const arr = [ 7, 8, 9 ];
+foo(1, ...arr);

package/runner/index.js

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

package/runner/repl.js

@@ -1,5 +1,6 @@
 import { TYPE_NAMES } from '../compiler/types.js';
 import compile from '../compiler/wrap.js';
+import parse from '../compiler/parse.js';
 
 import util from 'node:util';
 
@@ -83,7 +84,13 @@ const run = (source, _context, _filename, callback, run = true) => {
   // hack: print "secret" before latest code ran to only enable printing for new code
 
   source = source.trim();
-  if (source.startsWith('{') && source.endsWith('}')) source = '(' + source + ')';
+  if (source.startsWith('{') && source.endsWith('}')) {
+    const wrapped = '(' + source + ')';
+    try {
+      parse(wrapped);
+      source = wrapped;
+    } catch {}
+  }
 
   let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source;