porffor 0.55.32 → 0.55.33

package/compiler/codegen.js

@@ -43,7 +43,7 @@ const funcRef = func => {
   if (!doNotMarkFuncRef) func.referenced = true;
 
   if (globalThis.precompile) return [
-    [ Opcodes.const, 'funcref', func.name ]
+    [ 'funcref', Opcodes.const, func.name ]
   ];
 
   func.generate?.();
@@ -76,7 +76,7 @@ const funcRef = func => {
           name: '',
           jsLength: 0
         },
-        indirectIndex: indirectFuncs.length
+        indirectIndex: 0
       };
 
       // check not being constructed
@@ -89,8 +89,7 @@ const funcRef = func => {
       );
 
       // have empty func as indirect funcs 0 and 1
-      indirectFuncs.push(emptyFunc);
-      indirectFuncs.push(emptyFunc);
+      indirectFuncs.push(emptyFunc, emptyFunc);
     }
 
     const wasm = [];
@@ -2470,7 +2469,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       i32_const: { imms: 1, args: [], returns: 0 },
 
       // dst, src, size, _, _
-      memory_copy: { imms: 2, args: [ true, true, true ], returns: 0, addValue: true }
+      memory_copy: { imms: 2, args: [ true, true, true ], returns: 0, addValue: true },
+
+      // a, b
+      f64_eq: { imms: 0, args: [ false, false ], returns: 1 }
     };
 
     const opName = name.slice('__Porffor_wasm_'.length);
@@ -2670,16 +2672,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       continue;
     }
 
-    if (valtypeBinary !== Valtype.i32 &&
-      (func && func.params[paramOffset + i * (typedParams ? 2 : 1)] === Valtype.i32)
-    ) {
-      out.push(Opcodes.i32_to);
-    }
-
-    if (valtypeBinary === Valtype.i32 &&
-      (func && func.params[paramOffset + i * (typedParams ? 2 : 1)] === Valtype.f64)
-    ) {
-      out.push([ Opcodes.f64_convert_i32_s ]);
+    const argType = func ? func.params[paramOffset + i * (typedParams ? 2 : 1)] : valtypeBinary;
+    const localType = scope.locals[arg.name]?.type;
+    if ((valtypeBinary !== argType && localType !== argType) || (localType && localType !== argType && valtypeBinary !== Valtype.f64)) {
+      out.push(argType === Valtype.i32 ? Opcodes.i32_trunc_sat_f64_s : [ Opcodes.f64_convert_i32_s ]);
     }
 
     if (typedParams) out = out.concat(arg._callType ?? getNodeType(scope, arg));
@@ -2934,9 +2930,6 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary, fallthrough = fals
     for (const x of bc) {
       const k = x[0];
       if (k === 'default') continue;
-
-      // uncomment if needed/used again
-      // x[0] = k.split(',').map(x => +x);
       x[0] = +k;
     }
   }
@@ -3614,7 +3607,6 @@ const coctcSetup = (scope, object, tmp, msg, wasm = generate(scope, object), was
       [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_underlying').index ],
       [ Opcodes.drop ],
 
-      Opcodes.i32_to_u,
       [ Opcodes.local_set, tmp ],
 
       ...(known != null ? [] : [
@@ -5008,8 +5000,8 @@ const generateForIn = (scope, decl) => {
 };
 
 const generateSwitch = (scope, decl) => {
-  // special fast path just for `switch (Porffor.rawType(...))`
-  if (decl.discriminant.type === 'CallExpression' && decl.discriminant.callee.type === 'Identifier' && decl.discriminant.callee.name === '__Porffor_rawType') {
+  // special fast path just for `switch (Porffor.type(...))`
+  if (decl.discriminant.type === 'CallExpression' && decl.discriminant.callee.type === 'Identifier' && decl.discriminant.callee.name === '__Porffor_type') {
     const cases = []
     let canTypeCheck = true;
     for (const x of decl.cases) {
@@ -5403,7 +5395,7 @@ const makeString = (scope, str, forceBytestring = undefined) => {
   }
 
   if (globalThis.precompile) return [
-    [ Opcodes.const, 'str', str, forceBytestring ]
+    [ 'str', Opcodes.const, str, forceBytestring ]
   ];
 
   const ptr = allocStr({ scope, pages }, str, bytestring);
@@ -5520,7 +5512,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
 
     for (const x of decl.properties) {
       // method, shorthand are made into useful values by parser for us :)
-      let { type, argument, computed, kind, key, value } = x;
+      let { type, argument, computed, kind, value } = x;
 
       if (type === 'SpreadElement') {
         out.push(
@@ -5540,14 +5532,14 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         continue;
       }
 
-      const k = getProperty(x, true);
+      const key = getProperty(x, true);
       if (isFuncType(value.type)) {
         let id = value.id;
 
         // todo: support computed names properly
-        if (typeof k.value === 'string') id ??= {
+        if (typeof key.value === 'string') id ??= {
           type: 'Identifier',
-          name: k.value
+          name: key.value
         };
 
         value = { ...value, id };
@@ -5557,7 +5549,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         [ Opcodes.local_get, tmp ],
         number(TYPES.object, Valtype.i32),
 
-        ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
+        ...toPropertyKey(scope, generate(scope, key), getNodeType(scope, key), computed, true),
 
         ...generate(scope, value),
         ...(kind !== 'init' ? [ Opcodes.i32_to_u ] : []),
@@ -6113,7 +6105,7 @@ const generateClass = (scope, decl) => {
   scope.overrideThisType = TYPES.function;
 
   for (const x of body) {
-    let { type, key, value, kind, static: _static, computed } = x;
+    let { type, value, kind, static: _static, computed } = x;
     if (kind === 'constructor') continue;
 
     if (type === 'StaticBlock') {
@@ -6128,10 +6120,9 @@ const generateClass = (scope, decl) => {
       continue;
     }
 
+    const key = getProperty(x, true);
     let object = _static ? root : proto;
 
-    const k = getProperty(x, true);
-
     let initKind = type === 'MethodDefinition' ? 'method' : 'value';
     if (kind === 'get' || kind === 'set') initKind = kind;
 
@@ -6142,9 +6133,9 @@ const generateClass = (scope, decl) => {
       let id = value.id;
 
       // todo: support computed names properly
-      if (typeof k.value === 'string') id ??= {
+      if (typeof key.value === 'string') id ??= {
         type: 'Identifier',
-        name: k.value
+        name: key.value
       };
 
       value = {
@@ -6168,7 +6159,7 @@ const generateClass = (scope, decl) => {
         computedTmp = allocVar(scope, `#class_computed_prop${uniqId()}`, true, true, false, true);
 
         out.push(
-          ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
+          ...toPropertyKey(scope, generate(scope, key), getNodeType(scope, key), computed, true),
           [ Opcodes.global_set, computedTmp + 1 ],
           [ Opcodes.global_set, computedTmp ]
         );
@@ -6183,9 +6174,9 @@ const generateClass = (scope, decl) => {
           [ Opcodes.global_get, computedTmp ],
           [ Opcodes.global_get, computedTmp + 1 ],
         ] : [
-          ...generate(func, k),
+          ...generate(func, key),
           Opcodes.i32_to_u,
-          ...getNodeType(func, k)
+          ...getNodeType(func, key)
         ]),
 
         ...generate(func, value),
@@ -6200,7 +6191,7 @@ const generateClass = (scope, decl) => {
         Opcodes.i32_to_u,
         ...getNodeType(scope, object),
 
-        ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
+        ...toPropertyKey(scope, generate(scope, key), getNodeType(scope, key), computed, true),
 
         ...generate(scope, value),
         ...(initKind !== 'value' && initKind !== 'method' ? [ Opcodes.i32_to_u ] : []),
@@ -6468,8 +6459,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         globalThis.funcBodies[name] = body;
       }
 
-      // todo: enable for all block statement bodies, not just main
-      if (name === '#main') {
+      if (body.type === 'BlockStatement') {
         // hoist function declarations to the top of AST pre-codegen so
         // we can optimize function calls so calls before decl are not indirect
         // (without more post-codegen jank)
@@ -6860,7 +6850,7 @@ const internalConstrs = {
     length: 1
   },
 
-  __Porffor_rawType: {
+  __Porffor_type: {
     generate: (scope, decl) => [
       ...getNodeType(scope, decl.arguments[0]),
       Opcodes.i32_from_u

package/compiler/precompile.js

@@ -26,10 +26,11 @@ globalThis.valtypeOverrides = {
     __Porffor_object_set: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_setStrict: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_expr_init: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
-    __Porffor_object_expr_initWithFlags: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
+    __Porffor_object_fastAdd: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_class_value: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_class_method: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_define: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
+    __Porffor_object_underlying: [ Valtype.f64, Valtype.i32 ]
   }
 };
 
@@ -230,8 +231,8 @@ ${funcs.map(x => {
       .replace(/\["global",(.*?),"(.*?)",(.*?)\]/g, (_, opcode, name, valtype) => `...glbl(${opcode},'${name}',${valtype})`)
       .replace(/\"local","(.*?)",(.*?)\]/g, (_, name, valtype) => `loc('${name}',${valtype})]`)
       .replace(/\[16,"(.*?)"]/g, (_, name) => `[16,builtin('${name}')]`)
-      .replace(/\[(68|65),"funcref","(.*?)"]/g, (_1, op, name) => op === '65' ? `...i32ify(funcRef('${name}'))` : `...funcRef('${name}')`)
-      .replace(/\[(68|65),"str","(.*?)",(.*?)]/g, (_1, op, str, forceBytestring) => op === '65' ? `...i32ify(makeString(_,"${str}",${forceBytestring ? 1 : 0}))` : `...makeString(_,"${str}",${forceBytestring ? 1 : 0})`)
+      .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(/\["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/package.json

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

package/r.cjs

@@ -1,12 +1,5 @@
-Foo.prototype.baz = function baz() {};
-
-function Foo() {
-  this.bar = 1;
-}
-
-Foo.prototype.bar = function bar() {};
-
-
+// function foo(x) {}
+({...({})})
 
 // var EQUAL = 1;
 // var NOT_EQUAL = -1;

package/runner/index.js

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

package/compiler/builtins/__internal_object.ts

@@ -1,83 +0,0 @@
-const underlyingKeys: any[] = [];
-const underlyingVals: any[] = [];
-export const __Porffor_object_underlying = (obj: any): any => {
-  const t: i32 = Porffor.rawType(obj);
-  if (t == Porffor.TYPES.object) return obj;
-
-  if (Porffor.fastAnd(
-    t >= Porffor.TYPES.error,
-    t < 0x40
-  )) {
-    return obj as object;
-  }
-
-  if (Porffor.fastAnd(t > 0x05, t != Porffor.TYPES.undefined)) {
-    let idx: i32 = Porffor.array.fastIndexOf(underlyingKeys, obj);
-    if (idx == -1) {
-      const underlying: object = {};
-
-      if (t == Porffor.TYPES.function) {
-        if (ecma262.IsConstructor(obj)) { // constructor
-          // set prototype and prototype.constructor if function and constructor
-          const proto: object = {};
-          const key1: bytestring = 'prototype';
-          __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
-
-          const key2: bytestring = 'constructor';
-          __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
-        }
-
-        const key3: bytestring = 'name';
-        __Porffor_object_expr_initWithFlags(underlying, key3, __Porffor_funcLut_name(obj), 0b0010);
-
-        const key4: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key4, __Porffor_funcLut_length(obj), 0b0010);
-      }
-
-      if (t == Porffor.TYPES.array) {
-        const len: i32 = (obj as any[]).length;
-
-        const key5: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key5, len, 0b1000);
-
-        // todo: this should somehow be kept in sync?
-        for (let i: i32 = 0; i < len; i++) {
-          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), (obj as any[])[i], 0b1110);
-        }
-      }
-
-      if (Porffor.fastOr(t == Porffor.TYPES.string, t == Porffor.TYPES.stringobject)) {
-        const len: i32 = (obj as string).length;
-
-        const key6: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key6, len, 0b0000);
-
-        for (let i: i32 = 0; i < len; i++) {
-          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), (obj as string)[i], 0b0100);
-        }
-
-        if (t == Porffor.TYPES.string) Porffor.object.preventExtensions(underlying);
-      }
-
-      if (t == Porffor.TYPES.bytestring) {
-        const len: i32 = (obj as bytestring).length;
-
-        const key7: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key7, len, 0b0000);
-
-        for (let i: i32 = 0; i < len; i++) {
-          __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), (obj as bytestring)[i], 0b0100);
-        }
-
-        Porffor.object.preventExtensions(underlying);
-      }
-
-      Porffor.array.fastPush(underlyingVals, underlying);
-      idx = Porffor.array.fastPush(underlyingKeys, obj) - 1;
-    }
-
-    return underlyingVals[idx];
-  }
-
-  return obj;
-};