porffor 0.28.8 → 0.28.10

package/compiler/codegen.js

@@ -1934,8 +1934,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     target = { ...decl.callee };
     target.name = spl.slice(0, -1).join('_');
 
-    // failed to lookup name, abort
-    if (!lookupName(scope, target.name)[0]) protoName = null;
+    if (builtinFuncs['__' + target.name + '_' + protoName]) protoName = null;
+      else if (!lookupName(scope, target.name)[0] && !builtinFuncs[target.name]) {
+        if (lookupName(scope, '__' + target.name)[0] || builtinFuncs['__' + target.name]) target.name = '__' + target.name;
+          else protoName = null;
+      }
   }
 
   // literal.func()
@@ -2189,6 +2192,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     }
 
     if (Object.keys(protoBC).length > 0) {
+      let def = internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`);
+
+      // fallback to object prototype impl as a basic prototype chain hack
+      if (protoBC[TYPES.object]) def = protoBC[TYPES.object];
+
       return [
         ...out,
 
@@ -2196,7 +2204,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...protoBC,
 
           // TODO: error better
-          default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
+          default: def
         }, valtypeBinary)
       ];
     }
@@ -4862,14 +4870,8 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
       // hack: handle allocation for #member_prop's here instead of in several places /shrug
       let shouldGet = true;
       if (name === '#member_prop') {
-        if (!scope._allocatedMemberProp) {
-          out.push(
-            ...number(rawPtr),
-            [ global ? Opcodes.global_set : Opcodes.local_set, local.idx ]
-          );
-
-          scope._allocatedMemberProp = true;
-        }
+        out.push(...number(rawPtr, Valtype.i32));
+        shouldGet = false;
       }
 
       if (name === '#member_prop_assign') {
@@ -5500,7 +5502,7 @@ const objectHack = node => {
 };
 
 const generateFunc = (scope, decl) => {
-  const name = decl.id ? decl.id.name : `anonymous${uniqId()}`;
+  const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!

package/compiler/decompile.js

@@ -24,7 +24,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
   if (name) out += `${name}(${ind}) ${makeSignature(params, returns, locals)}\n`;
 
   const justLocals = Object.values(locals).sort((a, b) => a.idx - b.idx).slice(params.length);
-  for (const x of justLocals) {
+  if (name) for (const x of justLocals) {
     out += `;; local ${invLocals[x.idx]}(${x.idx}): ${invValtype[x.type]}\n`
   }
 

package/compiler/precompile.js

@@ -216,7 +216,10 @@ ${funcs.map(x => {
 
   const locals = Object.entries(x.locals).sort((a,b) => a[1].idx - b[1].idx)
 
-  return `  this.${x.name} = {
+  // todo: check for other identifier unsafe characters
+  const name = x.name.includes('#') ? `['${x.name}']` : `.${x.name}`;
+
+  return `  this${name} = {
     wasm: ${rewriteWasm(x.wasm)},
     params: ${JSON.stringify(x.params)}, typedParams: 1,
     returns: ${JSON.stringify(x.returns)}, ${x.returnType != null ? `returnType: ${JSON.stringify(x.returnType)}` : 'typedReturns: 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.28.8+a0f4bd584",
+  "version": "0.28.10+83363f3c5",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

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