porffor 0.34.20 → 0.35.0

package/CONTRIBUTING.md

@@ -366,7 +366,7 @@ builtins/tostring_number: impl radix
 
 ## Test262
 
-For the first time, ensure you run `./test262/setup.sh`.
+For the first time, ensure you run `./test262/setup.sh` (Unix) or `.\test262\setup.cmd` (Windows).
 
 Run `node test262` to run all the tests and get an output of total overall test results.
 

package/compiler/assemble.js

@@ -33,15 +33,11 @@ const encodeNames = funcs => {
     funcs.map(x => unsignedLEB128(x.asmIndex).concat(encodeString(x.name))),
   );
   const localsSection = encodeVector(
-    funcs.map(x =>
-      unsignedLEB128(x.asmIndex).concat(
-        encodeVector(
-          Object.entries(x.locals).map(([name, local]) =>
-            unsignedLEB128(local.idx).concat(encodeString(name)),
-          ),
-        ),
-      ),
-    ),
+    funcs.map(x => unsignedLEB128(x.asmIndex).concat(encodeVector(
+      Object.entries(x.locals).map(([name, local]) =>
+        unsignedLEB128(local.idx).concat(encodeString(name))
+      )
+    )))
   );
 
   return [
@@ -49,7 +45,7 @@ const encodeNames = funcs => {
     ...encodeSection(1, functionsSection),
     ...encodeSection(2, localsSection),
   ];
-}
+};
 
 export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) => {
   const types = [], typeCache = {};

package/compiler/codegen.js

@@ -1066,9 +1066,6 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
   }
 
   if (decl.operator === 'in') {
-    // hack: a in b -> Object.hasOwn(b, a)
-    // todo: not spec compliant, in should check prototype chain too (once we have it)
-
     return generate(scope, {
       type: 'CallExpression',
       callee: {
@@ -1112,6 +1109,7 @@ const asmFuncToAsm = (scope, func) => {
     builtin: (n, offset = false) => {
       let idx = funcIndex[n] ?? importedFuncs[n];
       if (idx == null && builtinFuncs[n]) {
+        // console.log(scope.name, '->', n);
         includeBuiltin(scope, n);
         idx = funcIndex[n];
       }
@@ -3173,7 +3171,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     const usedProps = [];
     for (const prop of properties) {
       if (prop.type == 'Property') { // let { foo } = {}
-        usedProps.push(!prop.computed && prop.key.type !== 'Literal' ? { type: 'Literal', value: prop.key.name } : prop.key);
+        usedProps.push(getProperty(prop));
 
         if (prop.value.type === 'AssignmentPattern') { // let { foo = defaultValue } = {}
           decls.push(
@@ -3257,13 +3255,22 @@ const generateVar = (scope, decl) => {
   return out;
 };
 
-const getMemberProperty = decl => {
-  if (decl.computed) return decl.property;
+const privateIDName = name => '.#.' + name;
+const privateIdentifierToIdentifier = decl => ({
+  type: 'Identifier',
+  name: privateIDName(decl.name)
+});
+
+const getProperty = decl => {
+  const prop = decl.property ?? decl.key;
+  if (decl.computed) return prop;
 
-  return {
+  if (prop.name) return {
     type: 'Literal',
-    value: decl.property.name
+    value: prop.type === 'PrivateIdentifier' ? privateIDName(prop.name) : prop.name,
   };
+
+  return prop;
 };
 
 // todo: optimize this func for valueUnused
@@ -3348,7 +3355,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     const pointerTmp = localTmp(scope, '#member_setter_ptr_tmp', Valtype.i32);
 
     const object = decl.left.object;
-    const property = getMemberProperty(decl.left);
+    const property = getProperty(decl.left);
 
     // todo/perf: use i32 object (and prop?) locals
     const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj') ] ];
@@ -3751,7 +3758,7 @@ const generateUnary = (scope, decl) => {
     case 'delete': {
       if (decl.argument.type === 'MemberExpression') {
         const object = decl.argument.object;
-        const property = getMemberProperty(decl.argument);
+        const property = getProperty(decl.argument);
 
         if (property.value === 'length' || property.value === 'name') scope.noFastFuncMembers = true;
 
@@ -5183,12 +5190,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         continue;
       }
 
-      let k = key;
-      if (!computed && key.type !== 'Literal') k = {
-        type: 'Literal',
-        value: key.name
-      };
-
+      const k = getProperty(x);
       if (isFuncType(value.type)) {
         let id = value.id;
 
@@ -5287,7 +5289,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   }
 
   const object = decl.object;
-  const property = getMemberProperty(decl);
+  const property = getProperty(decl);
 
   // generate now so type is gotten correctly later (it gets cached)
   generate(scope, object);
@@ -5404,7 +5406,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       const type = TYPES[x.split('_prototype')[0].slice(2).toLowerCase()];
       if (type == null) continue;
 
-      // do not __proto__ primitive hack for objects
+      // do not __proto__ primitive hack for objects or functions
       if (type === TYPES.object || type === TYPES.function) continue;
 
       const ident = {
@@ -5721,27 +5723,12 @@ const generateClass = (scope, decl) => {
 
   if (decl.superClass) {
     out.push(
-      ...generateCall(scope, {
-        type: 'CallExpression',
-        callee: {
-          type: 'Identifier',
-          name: '__Porffor_object_assignAll'
-        },
-        arguments: [
-          proto,
-          {
-            type: 'MemberExpression',
-            object: decl.superClass,
-            property: {
-              type: 'Identifier',
-              name: 'prototype'
-            },
-            computed: false,
-            optional: false
-          }
-        ]
-      }),
-      [ Opcodes.drop ]
+      // class Foo {}
+      // class Bar extends Foo {}
+      // Bar.__proto__ = Foo
+      // Bar.prototype.__proto__ = Foo.prototype
+      ...generate(scope, setObjProp(root, '__proto__', decl.superClass)),
+      ...generate(scope, setObjProp(getObjProp(root, 'prototype'), '__proto__', getObjProp(decl.superClass, 'prototype')))
     );
   }
 
@@ -5753,11 +5740,7 @@ const generateClass = (scope, decl) => {
 
     let object = _static ? root : proto;
 
-    let k = key;
-    if (!computed && key.type !== 'Literal') k = {
-      type: 'Literal',
-      value: key.name
-    };
+    const k = getProperty(x);
 
     let initKind = 'init';
     if (kind === 'get' || kind === 'set') initKind = kind;
@@ -6024,8 +6007,8 @@ const generateFunc = (scope, decl, outUnused = false) => {
             else func.returns = [];
         }
 
-        // inject promise job runner func at the end of main if job queue is used
-        if (Object.hasOwn(funcIndex, '__ecma262_HostEnqueuePromiseJob')) {
+        // inject promise job runner func at the end of main if promises are made
+        if (Object.hasOwn(funcIndex, 'Promise') || Object.hasOwn(funcIndex, '__Promise_resolve') || Object.hasOwn(funcIndex, '__Promise_reject')) {
           wasm.push(
             [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_runJobs').index ],
             [ Opcodes.drop ],
@@ -6358,8 +6341,8 @@ export default program => {
 
   delete globals['#ind'];
 
-  // if blank main func and other exports, remove it
-  if (main.wasm.length === 0 && funcs.reduce((acc, x) => acc + (x.export ? 1 : 0), 0) > 1) funcs.splice(main.index - importedFuncs.length, 1);
+  // if wanted and blank main func and other exports, remove it
+  if (Prefs.rmBlankMain && main.wasm.length === 0 && funcs.some(x => x.export)) funcs.splice(main.index - importedFuncs.length, 1);
 
   // make ~empty funcs for never generated funcs
   // todo: these should just be deleted once able

package/compiler/wrap.js

@@ -137,6 +137,9 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       // eg: __String_prototype_toLowerCase -> toLowerCase
       if (name.startsWith('__')) name = name.split('_').pop();
 
+      // anonymous functions
+      if (name.startsWith('#')) name = '';
+
       // make fake empty func for repl/etc
       return {[name]() {}}[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.34.20+ef2ae4c4d",
+  "version": "0.35.0+8b2f7cee3",
   "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.34.20+ef2ae4c4d';
+globalThis.version = '0.35.0+8b2f7cee3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {