porffor 0.55.2 → 0.55.4

package/compiler/codegen.js

@@ -474,9 +474,8 @@ const lookup = (scope, name, failEarly = false) => {
 
     // no local var with name
     if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
-
-    if (Object.hasOwn(importedFuncs, name)) return [ number(importedFuncs[name] - importedFuncs.length) ];
     if (Object.hasOwn(funcIndex, name)) return funcRef(funcByName(name));
+    if (Object.hasOwn(importedFuncs, name)) return [ number(importedFuncs[name] - importedFuncs.length) ];
 
     if (name.startsWith('__')) {
       // return undefined if unknown key in already known var
@@ -567,13 +566,8 @@ const generateReturn = (scope, decl) => {
       ...generate(scope, arg),
       ...getNodeType(scope, arg),
 
-      [ Opcodes.call, includeBuiltin(scope, scope.async ? '__Porffor_AsyncGenerator_prototype_return' : '__Porffor_Generator_prototype_return').index ],
-      [ Opcodes.drop ],
-      [ Opcodes.drop ],
-
-      // return generator
-      [ Opcodes.local_get, scope.locals['#generator_out'].idx ],
-      number(scope.async ? TYPES.__porffor_asyncgenerator : TYPES.__porffor_generator, Valtype.i32),
+      [ Opcodes.call, includeBuiltin(scope, scope.async ? '__Porffor_AsyncGenerator_return' : '__Porffor_Generator_return').index ],
+      // returns generator
       [ Opcodes.return ]
     ];
   }
@@ -1709,6 +1703,7 @@ const getNodeType = (scope, node) => {
     }
 
     if (node.type === 'ThisExpression') {
+      if (scope.overrideThisType) return scope.overrideThisType;
       if (!scope.constr) return getType(scope, 'globalThis');
       return [ [ Opcodes.local_get, scope.locals['#this#type'].idx ] ];
     }
@@ -2709,7 +2704,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   if ((builtinFuncs[name] && builtinFuncs[name].returns?.length === 0) ||
-      (importedFuncs[name] != null && importedFuncs[importedFuncs[name]]?.returns === 0)) {
+      (idx === importedFuncs[name] && importedFuncs[importedFuncs[name]]?.returns === 0)) {
     out.push(number(UNDEFINED));
   }
 
@@ -2717,18 +2712,18 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 };
 
 const generateThis = (scope, decl) => {
+  if (scope.overrideThis) return scope.overrideThis;
+
   if (!scope.constr) {
     // this in a non-constructor context is a reference to globalThis
     return [
-      ...generate(scope, { type: 'Identifier', name: 'globalThis' }),
-      ...setLastType(scope, getType(scope, 'globalThis'))
+      ...generate(scope, { type: 'Identifier', name: 'globalThis' })
     ];
   }
 
   // opt: do not check for pure constructors or strict mode
   if ((!globalThis.precompile && scope.strict) || scope._onlyConstr || scope._onlyThisMethod || decl._noGlobalThis) return [
-    [ Opcodes.local_get, scope.locals['#this'].idx ],
-    ...setLastType(scope, [ [ Opcodes.local_get, scope.locals['#this#type'].idx ] ])
+    [ Opcodes.local_get, scope.locals['#this'].idx ]
   ];
 
   return [
@@ -2749,8 +2744,7 @@ const generateThis = (scope, decl) => {
       ];
     }, 0 ],
 
-    [ Opcodes.local_get, scope.locals['#this'].idx ],
-    ...setLastType(scope, [ [ Opcodes.local_get, scope.locals['#this#type'].idx ] ])
+    [ Opcodes.local_get, scope.locals['#this'].idx ]
   ];
 };
 
@@ -6190,12 +6184,25 @@ const generateClass = (scope, decl) => {
     );
   }
 
+  scope.overrideThis = generate(scope, root);
+  scope.overrideThisType = TYPES.function;
+
   for (const x of body) {
     let { type, key, value, kind, static: _static, computed } = x;
-    if (type !== 'MethodDefinition' && type !== 'PropertyDefinition') return todo(scope, `class body type ${type} is not supported yet`, true);
-
     if (kind === 'constructor') continue;
 
+    if (type === 'StaticBlock') {
+      // todo: make this more compliant
+      out.push(
+        ...generate(scope, {
+          type: 'BlockStatement',
+          body: x.body
+        }),
+        [ Opcodes.drop ]
+      );
+      continue;
+    }
+
     let object = _static ? root : proto;
 
     const k = getProperty(x, true);
@@ -6253,6 +6260,9 @@ const generateClass = (scope, decl) => {
     );
   }
 
+  delete scope.overrideThis;
+  delete scope.overrideThisType;
+
   // error if not being constructed
   func.wasm.unshift(
     [ Opcodes.local_get, func.locals['#newtarget'].idx ],
@@ -6537,7 +6547,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
           addVarMetadata(func, name, false, typeAnno);
 
           // automatically add throws if unexpected this type to builtins
-          if (globalThis.precompile && i === 0 && func.name.includes('_prototype_')) {
+          if (globalThis.precompile && i === 0 && func.name.includes('_prototype_') && !func.name.startsWith('__Porffor_')) {
             if (typeAnno.type === TYPES.array) {
               // Array.from
               wasm.push(

package/compiler/wrap.js

@@ -366,10 +366,10 @@ export default (source, module = undefined, customImports = {}, print = str => p
     const disasm = disassemble(func.wasm.slice(min, max), func.name, 0, func.locals, func.params, func.returns, funcs, globals, exceptions)
       .slice(0, -1).split('\n').filter(x => !x.startsWith('\x1B[90m;;'));
 
-    const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
+    const noAnsi = s => s && s.replace(/\u001b\[[0-9]+m/g, '');
     let longest = 0;
     for (let j = 0; j < disassemble.length; j++) {
-      longest = Math.max(longest, noAnsi(disassemble[j]).length);
+      longest = Math.max(longest, noAnsi(disassemble[j])?.length ?? 0);
     }
 
     if (middleIndex != -1) {

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.55.2",
+  "version": "0.55.4",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/r.js

@@ -0,0 +1,2 @@
+function print() {}
+print();

package/runner/index.js

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