porffor 0.36.1 → 0.36.3

package/compiler/codegen.js

@@ -3141,15 +3141,22 @@ const privateIdentifierToIdentifier = decl => ({
   name: privateIDName(decl.name)
 });
 
-const getProperty = decl => {
+const getProperty = (decl, forceValueStr = false) => {
   const prop = decl.property ?? decl.key;
   if (decl.computed) return prop;
 
-  if (prop.name) return {
+  // identifier -> literal
+  if (prop.name != null) return {
     type: 'Literal',
     value: prop.type === 'PrivateIdentifier' ? privateIDName(prop.name) : prop.name,
   };
 
+  // force literal values to be string (eg 0 -> '0')
+  if (forceValueStr && prop.value != null) return {
+    ...prop,
+    value: prop.value.toString()
+  };
+
   return prop;
 };
 
@@ -3287,9 +3294,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
           ...getNodeType(scope, object),
 
-          ...propertyWasm,
-          ...getNodeType(scope, property),
-          ...toPropertyKey(scope, op === '='),
+          ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.left.computed, op === '='),
           ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
           ...(op === '=' ? [] : [
             Opcodes.i32_to_u,
@@ -3309,7 +3314,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
           ...getNodeType(scope, decl),
 
-          [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_set').index ],
+          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
           [ Opcodes.drop ],
           // ...setLastType(scope, getNodeType(scope, decl)),
         ],
@@ -3320,9 +3325,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
           ...getNodeType(scope, object),
 
-          ...propertyWasm,
-          ...getNodeType(scope, property),
-          ...toPropertyKey(scope, op === '='),
+          ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.left.computed, op === '='),
           ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
           ...(op === '=' ? [] : [
             Opcodes.i32_to_u,
@@ -3342,7 +3345,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
           ...getNodeType(scope, decl),
 
-          [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_set').index ],
+          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_setStrict' : '__Porffor_object_set').index ],
           [ Opcodes.drop ],
           // ...setLastType(scope, getNodeType(scope, decl)),
         ],
@@ -3647,11 +3650,9 @@ const generateUnary = (scope, decl) => {
           Opcodes.i32_to_u,
           ...getNodeType(scope, object),
 
-          ...generate(scope, property),
-          ...getNodeType(scope, property),
-          ...toPropertyKey(scope, true),
+          ...toPropertyKey(scope, generate(scope, property), getNodeType(scope, property), decl.argument.computed, true),
 
-          [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_delete').index ],
+          [ Opcodes.call, includeBuiltin(scope, scope.strict ? '__Porffor_object_deleteStrict' : '__Porffor_object_delete').index ],
           [ Opcodes.drop ],
           Opcodes.i32_from_u
         ];
@@ -4781,7 +4782,7 @@ const printStaticStr = str => {
     out.push(
       // ...number(str.charCodeAt(i)),
       ...number(str.charCodeAt(i), Valtype.i32),
-      Opcodes.i32_from_u,
+      [ Opcodes.f64_convert_i32_u ],
       [ Opcodes.call, importedFuncs.printChar ]
     );
   }
@@ -4895,13 +4896,14 @@ 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') {
-        out.push(...number(rawPtr, Valtype.i32));
+        out.push(...number(rawPtr));
         shouldGet = false;
       }
 
       if (name === '#member_prop_assign') {
         out.push(
-          [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ]
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
+          Opcodes.i32_from_u
         );
         shouldGet = false;
       }
@@ -4911,7 +4913,14 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
         ...(shouldGet ? [
           [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
           Opcodes.i32_to_u
-        ] : []),
+        ] : [
+          // hack: make precompile realise we are allocating
+          ...(globalThis.precompile ? [
+            [ global ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+            [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+          ] : []),
+          Opcodes.i32_to_u
+        ]),
         [ Opcodes.local_set, pointerTmp ]
       );
 
@@ -5040,13 +5049,20 @@ const generateArray = (scope, decl, global = false, name = '$undeclared', initEm
   return makeArray(scope, decl, global, name, initEmpty, valtype, false, true)[0];
 };
 
-const toPropertyKey = (scope, i32Conv = false) => [
+// opt: do not call ToPropertyKey for non-computed properties as unneeded
+const toPropertyKey = (scope, wasm, type, computed = false, i32Conv = false) => computed ? [
+  ...wasm,
+  ...type,
   [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToPropertyKey').index ],
   ...(i32Conv ? [
     [ Opcodes.local_set, localTmp(scope, '#swap', Valtype.i32) ],
     Opcodes.i32_to_u,
     [ Opcodes.local_get, localTmp(scope, '#swap', Valtype.i32) ]
   ] : [])
+] : [
+  ...wasm,
+  ...(i32Conv ? [ Opcodes.i32_to_u ] : []),
+  ...type
 ];
 
 const generateObject = (scope, decl, global = false, name = '$undeclared') => {
@@ -5083,7 +5099,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         continue;
       }
 
-      const k = getProperty(x);
+      const k = getProperty(x, true);
       if (isFuncType(value.type)) {
         let id = value.id;
 
@@ -5100,9 +5116,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         [ Opcodes.local_get, tmp ],
         ...number(TYPES.object, Valtype.i32),
 
-        ...generate(scope, k),
-        ...getNodeType(scope, k),
-        ...toPropertyKey(scope, true),
+        ...toPropertyKey(scope, generate(scope, k), getNodeType(scope, k), computed, true),
 
         ...generate(scope, value),
         ...(kind !== 'init' ? [ Opcodes.i32_to_u ] : []),
@@ -5397,9 +5411,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       Opcodes.i32_to_u,
       ...getNodeType(scope, object),
 
-      ...propertyWasm,
-      ...getNodeType(scope, property),
-      ...toPropertyKey(scope, true),
+      ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
 
       [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
       ...setLastType(scope)
@@ -5410,9 +5422,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       Opcodes.i32_to_u,
       ...getNodeType(scope, object),
 
-      ...propertyWasm,
-      ...getNodeType(scope, property),
-      ...toPropertyKey(scope, true),
+      ...toPropertyKey(scope, propertyWasm, getNodeType(scope, property), decl.computed, true),
 
       [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
       ...setLastType(scope)
@@ -5633,7 +5643,7 @@ const generateClass = (scope, decl) => {
 
     let object = _static ? root : proto;
 
-    const k = getProperty(x);
+    const k = getProperty(x, true);
 
     let initKind = 'init';
     if (kind === 'get' || kind === 'set') initKind = kind;
@@ -5674,9 +5684,7 @@ const generateClass = (scope, decl) => {
       Opcodes.i32_to_u,
       ...getNodeType(outScope, object),
 
-      ...generate(outScope, k),
-      ...getNodeType(outScope, k),
-      ...toPropertyKey(outScope, true),
+      ...toPropertyKey(outScope, generate(outScope, k), getNodeType(outScope, k), computed, true),
 
       ...generate(outScope, value),
       ...(initKind !== 'init' ? [ Opcodes.i32_to_u ] : []),
@@ -5765,6 +5773,8 @@ const objectHack = node => {
       if (objectName !== 'Object_prototype' && (node.property.name === 'propertyIsEnumerable' || node.property.name === 'hasOwnProperty' || node.property.name === 'isPrototypeOf')) return abortOut;
 
       const name = '__' + objectName + '_' + node.property.name;
+      if ((!hasFuncWithName(name) && !Object.hasOwn(builtinVars, name)) && (hasFuncWithName(objectName) || Object.hasOwn(builtinVars, objectName))) return abortOut;
+
       if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 
       return {

package/compiler/index.js

@@ -16,8 +16,9 @@ globalThis.decompile = decompile;
 const logFuncs = (funcs, globals, exceptions) => {
   console.log('\n' + underline(bold('funcs')));
 
+  const wanted = Prefs.f;
   for (const f of funcs) {
-    if (f.internal) continue;
+    if ((wanted && f.name !== wanted) || (!wanted && f.internal)) continue;
     console.log(decompile(f.wasm, f.name, f.index, f.locals, f.params, f.returns, funcs, globals, exceptions));
   }
 
@@ -166,7 +167,7 @@ export default (code, flags) => {
   const wasm = out.wasm = assemble(funcs, globals, tags, pages, data, flags);
   if (logProgress) progressDone('assembled', t3);
 
-  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
+  if (Prefs.optFuncs || Prefs.f) logFuncs(funcs, globals, exceptions);
 
   if (Prefs.compileAllocLog) {
     const wasmPages = Math.ceil((pages.size * pageSize) / 65536);

package/compiler/precompile.js

@@ -53,11 +53,13 @@ const compile = async (file, _funcs) => {
   const returnOverrides = {
     __Porffor_object_get: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_set: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_setStrict: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_packAccessor: [ Valtype.f64, Valtype.i32 ]
   };
 
   const paramOverrides = {
     __Porffor_object_set: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_setStrict: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_expr_init: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_expr_initWithFlags: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
     __Porffor_object_define: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],

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