porffor 0.30.7 → 0.30.9

package/compiler/codegen.js

@@ -1895,6 +1895,77 @@ const createNewTarget = (scope, decl, idx = 0) => {
   ];
 };
 
+const makeObject = (scope, obj) => {
+  const properties = [];
+  for (const x in obj) {
+    properties.push({
+      type: 'Property',
+      method: false,
+      shorthand: false,
+      computed: false,
+      key: {
+        type: 'Identifier',
+        name: x
+      },
+      value: obj[x],
+      kind: 'init'
+    });
+  }
+
+  return generateObject(scope, {
+    type: 'ObjectExpression',
+    properties
+  });
+};
+
+const getObjProp = (obj, prop) => {
+  if (typeof obj === 'string') obj = {
+    type: 'Identifier',
+    name: obj
+  };
+
+  if (typeof prop === 'string') prop = {
+    type: 'Identifier',
+    name: prop
+  };
+
+  return objectHack({
+    type: 'MemberExpression',
+    object: obj,
+    property: prop,
+    computed: false,
+    optional: false
+  });
+};
+
+const setObjProp = (obj, prop, value) => {
+  if (typeof obj === 'string') obj = {
+    type: 'Identifier',
+    name: obj
+  };
+
+  if (typeof prop === 'string') prop = {
+    type: 'Identifier',
+    name: prop
+  };
+
+  return objectHack({
+    type: 'ExpressionStatement',
+    expression: {
+      type: 'AssignmentExpression',
+      operator: '=',
+      left: {
+        type: 'MemberExpression',
+        object: obj,
+        property: prop,
+        computed: false,
+        optional: false
+      },
+      right: value
+    }
+  });
+};
+
 const createThisArg = (scope, decl, knownThis = undefined) => {
   if (knownThis) {
     // todo: check compliance
@@ -1902,11 +1973,8 @@ const createThisArg = (scope, decl, knownThis = undefined) => {
   }
 
   if (decl._new) {
-    // todo: created object should have .prototype = func.prototype
-    // todo: created object should have .constructor = func
     return [
-      // create an empty object
-      ...generateObject(scope, { properties: [] }),
+      ...makeObject(scope, {}),
       ...number(TYPES.object, Valtype.i32)
     ];
   } else {
@@ -2656,7 +2724,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     if (valtypeBinary === Valtype.i32 &&
       (func && func.params[paramOffset + i * (typedParams ? 2 : 1)] === Valtype.f64)
     ) {
-      out.push(Opcodes.i32_from);
+      out.push([ Opcodes.f64_convert_i32_u ]);
     }
 
     if (typedParams) out = out.concat(arg._callType ?? getNodeType(scope, arg));
@@ -3011,7 +3079,7 @@ const extractTypeAnnotation = decl => {
 };
 
 const setLocalWithType = (scope, name, isGlobal, decl, tee = false, overrideType = undefined) => {
-  const local = isGlobal ? globals[name] : scope.locals[name];
+  const local = isGlobal ? globals[name] : (scope.locals[name] ?? { idx: name });
   const out = Array.isArray(decl) ? decl : generate(scope, decl, isGlobal, name);
 
   // optimize away last type usage
@@ -3445,6 +3513,39 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           // ...setLastType(scope, getNodeType(scope, decl)),
         ],
 
+        [TYPES.function]: [
+          ...objectWasm,
+          Opcodes.i32_to_u,
+          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object', Valtype.i32) ] ]),
+          ...getNodeType(scope, object),
+
+          ...propertyWasm,
+          ...getNodeType(scope, property),
+          ...toPropertyKey(scope, op === '='),
+          ...(op === '=' ? [] : [ [ Opcodes.local_set, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
+          ...(op === '=' ? [] : [
+            Opcodes.i32_to_u,
+            [ Opcodes.local_tee, localTmp(scope, '#objset_property', Valtype.i32) ]
+          ]),
+          ...(op === '=' ? [] : [ [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ] ]),
+
+          ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
+            [ Opcodes.local_get, localTmp(scope, '#objset_object', Valtype.i32) ],
+            ...getNodeType(scope, object),
+
+            [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
+            [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
+
+            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
+            ...setLastType(scope)
+          ], 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.drop ],
+          // ...setLastType(scope, getNodeType(scope, decl)),
+        ],
+
         ...wrapBC({
           [TYPES.uint8array]: [
             [ Opcodes.i32_add ],
@@ -3738,6 +3839,8 @@ const generateUnary = (scope, decl) => {
         const object = decl.argument.object;
         const property = getMemberProperty(decl.argument);
 
+        if (property.value === 'length' || property.value === 'name') scope.noFastFuncMembers = true;
+
         return [
           ...generate(scope, object),
           Opcodes.i32_to_u,
@@ -5249,7 +5352,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   const name = decl.object.name;
 
   // hack: .name
-  if (decl.property.name === 'name' && hasFuncWithName(name)) {
+  if (decl.property.name === 'name' && hasFuncWithName(name) && !scope.noFastFuncMembers) {
     let nameProp = name;
 
     // eg: __String_prototype_toLowerCase -> toLowerCase
@@ -5262,12 +5365,14 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   if (decl.property.name === 'length') {
     // todo: support optional
 
-    const func = funcs.find(x => x.name === name);
-    if (func) return withType(scope, number(countLength(func, name)), TYPES.number);
+    if (!scope.noFastFuncMembers) {
+      const func = funcs.find(x => x.name === name);
+      if (func) return withType(scope, number(countLength(func, name)), TYPES.number);
 
-    if (Object.hasOwn(builtinFuncs, name)) return withType(scope, number(countLength(builtinFuncs[name], name)), TYPES.number);
-    if (Object.hasOwn(importedFuncs, name)) return withType(scope, number(importedFuncs[name].params.length ?? importedFuncs[name].params), TYPES.number);
-    if (Object.hasOwn(internalConstrs, name)) return withType(scope, number(internalConstrs[name].length ?? 0), TYPES.number);
+      if (Object.hasOwn(builtinFuncs, name)) return withType(scope, number(countLength(builtinFuncs[name], name)), TYPES.number);
+      if (Object.hasOwn(importedFuncs, name)) return withType(scope, number(importedFuncs[name].params.length ?? importedFuncs[name].params), TYPES.number);
+      if (Object.hasOwn(internalConstrs, name)) return withType(scope, number(internalConstrs[name].length ?? 0), TYPES.number);
+    }
 
     const out = [
       ...generate(scope, decl.object),
@@ -5783,9 +5888,20 @@ const generateFunc = (scope, decl) => {
     // todo: wrap in try and reject thrown value once supported
   }
 
+  if (!globalThis.precompile && func.constr) {
+    wasm.unshift(
+      // if being constructed
+      [ Opcodes.local_get, '#newtarget' ],
+      Opcodes.i32_to_u,
+      [ Opcodes.if, Blocktype.void ],
+        // set prototype of this ;)
+        ...generate(func, setObjProp({ type: 'ThisExpression' }, '__proto__', getObjProp(func.name, 'prototype'))),
+      [ Opcodes.end ]
+    );
+  }
+
   if (name === 'main') {
     func.gotLastType = true;
-
     func.export = true;
     func.returns = [ valtypeBinary, Valtype.i32 ];
 
@@ -5811,7 +5927,7 @@ const generateFunc = (scope, decl) => {
         else func.returns = [];
     }
 
-    // inject promise job runner func at the end of main if used
+    // inject promise job runner func at the end of main if job queue is used
     if (Object.hasOwn(funcIndex, '__ecma262_HostEnqueuePromiseJob')) {
       wasm.push(
         [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_runJobs').index ],

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