porffor 0.50.29 → 0.55.0

package/compiler/codegen.js

@@ -492,6 +492,11 @@ const lookup = (scope, name, failEarly = false) => {
       if (parentLookup != null) return [ number(UNDEFINED) ];
     }
 
+    if (scope.name === name) {
+      // fallback for own func but with a different var/id name
+      return funcRef(funcByIndex(scope.index));
+    }
+
     if (failEarly) return null;
 
     return [ [ null, () => hoistLookup(scope, name), 1 ] ];
@@ -514,6 +519,18 @@ const generateIdent = (scope, decl) => {
 const generateYield = (scope, decl) => {
   const arg = decl.argument ?? DEFAULT_VALUE();
 
+  if (!scope.generator) {
+    // todo: access upper-scoped generator
+    return [
+      ...generate(scope, arg),
+      [ Opcodes.drop ],
+
+      // use undefined as yield expression value
+      number(0),
+      ...setLastType(scope, TYPES.undefined)
+    ];
+  }
+
   // just support a single yield like a return for now
   return [
     // return value in generator
@@ -2419,6 +2436,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   let idx;
   if (Object.hasOwn(funcIndex, name)) {
     idx = funcIndex[name];
+  } else if (scope.name === name) {
+    // fallback for own func but with a different var/id name
+    idx = scope.index;
   } else if (Object.hasOwn(importedFuncs, name)) {
     idx = importedFuncs[name];
     scope.usesImports = true;
@@ -3234,18 +3254,23 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
 
   const topLevel = scope.name === '#main';
   if (pattern.type === 'Identifier') {
-    let out = [];
     const name = pattern.name;
 
     hoist(scope, name, kind === 'var' ? 1 : 2, global);
 
     if (init && isFuncType(init.type)) {
-      // hack for let a = function () { ... }
-      if (!init.id) {
-        setDefaultFuncName(init, name);
-        generateFunc(scope, init, true);
-        return out;
+      // opt: make decl with func expression like declaration
+      setDefaultFuncName(init, name);
+      const [ _func, out ] = generateFunc(scope, init, true);
+
+      const funcName = init.id?.name;
+      if (name !== funcName) {
+        funcIndex[name] = funcIndex[funcName];
+        delete funcIndex[funcName];
       }
+
+      out.push([ Opcodes.drop ]);
+      return out;
     }
 
     if (defaultValue && isFuncType(defaultValue.type)) {
@@ -3253,6 +3278,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       setDefaultFuncName(defaultValue, name);
     }
 
+    let out = [];
     if (topLevel && Object.hasOwn(builtinVars, name)) {
       // cannot redeclare
       if (kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
@@ -3611,23 +3637,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
   const [ local, isGlobal ] = lookupName(scope, name);
 
-  // if (isFuncType(decl.right.type)) {
-  //   // hack for a = function () { ... }
-  //   decl.right.id = { name };
-
-  //   const func = generateFunc(scope, decl.right);
-
-  //   return [
-  //     number(func.index - importedFuncs.length),
-  //     ...(local != null ? [
-  //       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-  //       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-
-  //       ...setType(scope, name, TYPES.function)
-  //     ] : [])
-  //   ];
-  // }
-
   const op = decl.operator.slice(0, -1) || '=';
 
   // hack: .length setter
@@ -5299,7 +5308,7 @@ const generateMeta = (scope, decl) => {
       [ Opcodes.local_get, scope.locals['#newtarget'].idx ]
     ];
 
-    // not constructor so does not exist, return undefined
+    // todo: access upper-scoped new.target
     return [ number(UNDEFINED) ];
   }
 
@@ -5679,6 +5688,9 @@ const generateMember = (scope, decl, _global, _name) => {
 
   // hack: .name
   if (decl.property.name === 'name' && hasFuncWithName(name) && !scope.noFastFuncMembers) {
+    // function name can mismatch variable/access name
+    name = funcByName(name)?.name ?? name;
+
     // eg: __String_prototype_toLowerCase -> toLowerCase
     if (name.startsWith('__')) name = name.split('_').pop();
     if (name.startsWith('#')) name = '';

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.50.29",
+  "version": "0.55.0",
   "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.50.29';
+globalThis.version = '0.55.0';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {