porffor 0.55.21 → 0.55.22

package/compiler/codegen.js

@@ -10,14 +10,6 @@ import { log } from './log.js';
 import { allocPage, allocStr } from './allocator.js';
 import './prefs.js';
 
-let globals = {};
-let tags = [];
-let funcs = [];
-let exceptions = [];
-let funcIndex = {};
-let currentFuncIndex = importedFuncs.length;
-let builtinFuncs = {}, builtinVars = {}, prototypeFuncs = {};
-
 class TodoError extends Error {
   constructor(message) {
     super(message);
@@ -46,7 +38,6 @@ const cacheAst = (decl, wasm) => {
   return wasm;
 };
 
-let indirectFuncs = [];
 let doNotMarkFuncRef = false;
 const funcRef = func => {
   if (!doNotMarkFuncRef) func.referenced = true;
@@ -1393,7 +1384,6 @@ const isExistingProtoFunc = name => {
   return false;
 };
 
-let globalInfer;
 const getInferred = (scope, name, global = false) => {
   if (global) {
     if (globalInfer.has(name)) return globalInfer.get(name);
@@ -2907,8 +2897,7 @@ const brTable = (input, bc, returns) => {
   for (let i = offset; i <= max; i++) {
     // if branch for this num, go to that block
     if (bc[i]) {
-      table.push(br);
-      br++;
+      table.push(br++);
       continue;
     }
 
@@ -2945,9 +2934,6 @@ const brTable = (input, bc, returns) => {
   return out;
 };
 
-let typeswitchDepth = 0;
-
-let usedTypes = new Set();
 const typeUsed = (scope, x) => {
   if (x == null) return;
   usedTypes.add(x);
@@ -3103,7 +3089,7 @@ const typeIsNotOneOf = (type, types, valtype = Valtype.i32) => {
   return out;
 };
 
-const allocVar = (scope, name, global = false, type = true, redecl = false) => {
+const allocVar = (scope, name, global = false, type = true, redecl = false, i32 = false) => {
   const target = global ? globals : scope.locals;
 
   // already declared
@@ -3118,7 +3104,7 @@ const allocVar = (scope, name, global = false, type = true, redecl = false) => {
   }
 
   let idx = global ? globals['#ind']++ : scope.localInd++;
-  target[name] = { idx, type: valtypeBinary };
+  target[name] = { idx, type: i32 ? Valtype.i32 : valtypeBinary };
 
   if (type) {
     let typeIdx = global ? globals['#ind']++ : scope.localInd++;
@@ -3600,7 +3586,6 @@ const memberTmpNames = scope => {
 };
 
 // COCTC: cross-object compile-time cache
-let coctc = new Map();
 const coctcOffset = prop => {
   if (typeof prop === 'object') {
     if (
@@ -4427,7 +4412,6 @@ const generateConditional = (scope, decl) => {
   return out;
 };
 
-let depth = [];
 const generateFor = (scope, decl) => {
   const out = [];
 
@@ -5364,9 +5348,6 @@ const generateMeta = (scope, decl) => {
   return todo(scope, `meta property object ${decl.meta.name} is not supported yet`, true);
 };
 
-let pages = new Map();
-let data = [];
-
 const compileBytes = (val, itemType) => {
   switch (itemType) {
     case 'i8': return [ val % 256 ];
@@ -6220,18 +6201,6 @@ const generateClass = (scope, decl) => {
     // default value to undefined
     value ??= DEFAULT_VALUE();
 
-    let outArr = out, outOp = 'push', outScope = scope;
-    if (type === 'PropertyDefinition' && !_static) {
-      // define in construction instead
-      outArr = func.wasm;
-      outOp = 'unshift';
-      object = {
-        type: 'ThisExpression',
-        _noGlobalThis: true
-      };
-      outScope = func;
-    }
-
     if (isFuncType(value.type)) {
       let id = value.id;
 
@@ -6249,19 +6218,60 @@ const generateClass = (scope, decl) => {
       };
     }
 
-    outArr[outOp](
-      ...generate(outScope, object),
-      Opcodes.i32_to_u,
-      ...getNodeType(outScope, object),
+    if (type === 'PropertyDefinition' && !_static) {
+      // define in construction instead
+      object = {
+        type: 'ThisExpression',
+        _noGlobalThis: true
+      };
 
-      ...toPropertyKey(outScope, generate(outScope, k), getNodeType(outScope, k), computed, true),
+      let computedTmp;
+      if (computed) {
+        // compute now, reference in construction
+        computedTmp = allocVar(scope, `#class_computed_prop${uniqId()}`, true, true, false, true);
 
-      ...generate(outScope, value),
-      ...(initKind !== 'value' && initKind !== 'method' ? [ Opcodes.i32_to_u ] : []),
-      ...getNodeType(outScope, value),
+        out.push(
+          ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
+          [ Opcodes.global_set, computedTmp + 1 ],
+          [ Opcodes.global_set, computedTmp ]
+        );
+      }
 
-      [ Opcodes.call, includeBuiltin(outScope, `__Porffor_object_class_${initKind}`).index ]
-    );
+      func.wasm.unshift(
+        ...generate(func, object),
+        Opcodes.i32_to_u,
+        ...getNodeType(func, object),
+
+        ...(computed ? [
+          [ Opcodes.global_get, computedTmp ],
+          [ Opcodes.global_get, computedTmp + 1 ],
+        ] : [
+          ...generate(func, k),
+          Opcodes.i32_to_u,
+          ...getNodeType(func, k)
+        ]),
+
+        ...generate(func, value),
+        ...(initKind !== 'value' && initKind !== 'method' ? [ Opcodes.i32_to_u ] : []),
+        ...getNodeType(func, value),
+
+        [ Opcodes.call, includeBuiltin(func, `__Porffor_object_class_${initKind}`).index ]
+      );
+    } else {
+      out.push(
+        ...generate(scope, object),
+        Opcodes.i32_to_u,
+        ...getNodeType(scope, object),
+
+        ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
+
+        ...generate(scope, value),
+        ...(initKind !== 'value' && initKind !== 'method' ? [ Opcodes.i32_to_u ] : []),
+        ...getNodeType(scope, value),
+
+        [ Opcodes.call, includeBuiltin(scope, `__Porffor_object_class_${initKind}`).index ]
+      );
+    }
   }
 
   delete scope.overrideThis;
@@ -6784,7 +6794,6 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
   return [ func, out ];
 };
 
-let largestBlockBody = 0;
 const generateBlock = (scope, decl) => {
   let out = [];
 
@@ -6792,10 +6801,8 @@ const generateBlock = (scope, decl) => {
   scope.inferTree.push(decl);
 
   let len = decl.body.length, j = 0;
-  if (len > largestBlockBody) largestBlockBody = len;
   for (let i = 0; i < len; i++) {
     const x = decl.body[i];
-    if (len >= largestBlockBody) globalThis.progress?.(`${i}/${len}`);
     if (isEmptyNode(x)) continue;
 
     if (j++ > 0) out.push([ Opcodes.drop ]);
@@ -6958,10 +6965,9 @@ const internalConstrs = {
   }
 };
 
+let globals, tags, exceptions, funcs, indirectFuncs, funcIndex, currentFuncIndex, depth, pages, data, typeswitchDepth, usedTypes, coctc, globalInfer, builtinFuncs, builtinVars, prototypeFuncs;
 export default program => {
-  globals = {
-    ['#ind']: 0
-  };
+  globals = { ['#ind']: 0 };
   tags = [];
   exceptions = [];
   funcs = []; indirectFuncs = [];
@@ -6971,26 +6977,22 @@ export default program => {
   data = [];
   currentFuncIndex = importedFuncs.length;
   typeswitchDepth = 0;
-  largestBlockBody = 0;
   usedTypes = new Set([ TYPES.empty, TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ]);
   coctc = new Map();
   globalInfer = new Map();
 
-  const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
-
   // set generic opcodes for current valtype
+  const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
   Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
   Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
   Opcodes.eqz = [ [ [ Opcodes.i32_eqz ] ], [ [ Opcodes.i64_eqz ] ], [ number(0), [ Opcodes.f64_eq ] ] ][valtypeInd];
   Opcodes.mul = [ Opcodes.i32_mul, Opcodes.i64_mul, Opcodes.f64_mul ][valtypeInd];
   Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
   Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
-
   Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
   Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
   Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
   Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
-
   Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
   Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
 

package/package.json

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

package/r.cjs

@@ -1,4 +1,10 @@
+class C {
+  [(() => { return Math.random(); })()] = 1337;
+}
 
+console.log(new C());
+console.log(new C());
+console.log(new C());
 
 // let o = { set foo(x) { console.log('set foo', x); }, __proto__: { set bar(x) { console.log('set bar', x); } } };
 

package/runner/index.js

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