porffor 0.36.6 → 0.37.0

package/compiler/codegen.js

@@ -104,6 +104,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'ThisExpression':
       return cacheAst(decl, generateThis(scope, decl));
 
+    case 'Super':
+      return cacheAst(decl, generateSuper(scope, decl));
+
     case 'Literal':
       return cacheAst(decl, generateLiteral(scope, decl, global, name));
 
@@ -245,7 +248,8 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
             const encodeFunc = ({
               [Opcodes.f64_const]: x => x,
-              [Opcodes.if]: unsignedLEB128
+              [Opcodes.if]: unsignedLEB128,
+              [Opcodes.loop]: unsignedLEB128
             })[inst[0]] ?? signedLEB128;
             out.push([ ...inst, ...immediates.flatMap(x => encodeFunc(x)) ]);
           }
@@ -311,7 +315,8 @@ const lookupName = (scope, _name) => {
 };
 
 const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysValueInternalThrows) => [
-  ...generateThrow(scope, {
+  ...generate(scope, {
+    type: 'ThrowStatement',
     argument: {
       type: 'NewExpression',
       callee: {
@@ -1601,8 +1606,8 @@ const RTArrayUtil = {
   ]
 };
 
-const createNewTarget = (scope, decl, idx = 0) => {
-  if (decl._new) {
+const createNewTarget = (scope, decl, idx = 0, force = false) => {
+  if (decl._new || force) {
     return [
       ...(typeof idx === 'number' ? number(idx) : idx),
       ...number(TYPES.function, Valtype.i32)
@@ -1632,7 +1637,7 @@ const makeObject = (scope, obj) => {
     });
   }
 
-  return generateObject(scope, {
+  return generate(scope, {
     type: 'ObjectExpression',
     properties
   });
@@ -1692,13 +1697,48 @@ const createThisArg = (scope, decl, knownThis = undefined) => {
     return knownThis;
   }
 
+  const name = mapName(decl.callee?.name);
   if (decl._new) {
+    // if precompiling or builtin func, just make empty object
+    if (globalThis.precompile || Object.hasOwn(builtinFuncs, name)) return [
+      ...makeObject(scope, {}),
+      ...number(TYPES.object, Valtype.i32)
+    ];
+
+    // create new object with __proto__ set to callee prototype
+    const tmp = localTmp(scope, '#this_create_tmp');
+    const proto = getObjProp(decl.callee, 'prototype');
+    localTmp(scope, '#member_prop_assign');
+
     return [
       ...makeObject(scope, {}),
+      [ Opcodes.local_tee, tmp ],
+      Opcodes.i32_to_u,
+
+      ...number(TYPES.object, Valtype.i32),
+
+      ...generate(scope, {
+        type: 'Literal',
+        value: '__proto__'
+      }, false, '#member_prop_assign'),
+      Opcodes.i32_to_u,
+      ...number(TYPES.bytestring, Valtype.i32),
+
+      ...generate(scope, proto),
+      ...getNodeType(scope, proto),
+
+      // flags: writable
+      ...number(0b1000, Valtype.i32),
+      ...number(TYPES.number, Valtype.i32),
+
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_expr_initWithFlags').index ],
+      [ Opcodes.drop ],
+      [ Opcodes.drop ],
+
+      [ Opcodes.local_get, tmp ],
       ...number(TYPES.object, Valtype.i32)
     ];
   } else {
-    const name = mapName(decl.callee?.name);
     if (name && name.startsWith('__') && name.includes('_prototype_')) {
       // todo: this should just be same as decl._new
       // but we do not support prototype, constructor, etc yet
@@ -1714,7 +1754,7 @@ const createThisArg = (scope, decl, knownThis = undefined) => {
       };
 
       return [
-        ...generateCall(scope, node),
+        ...generate(scope, node),
         ...getNodeType(scope, node)
       ];
     }
@@ -1733,7 +1773,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   // opt: virtualize iifes
   if (isFuncType(decl.callee.type)) {
-    const [ func ] = generateFunc(scope, decl.callee, true);
+    const [ func ] = generateFunc(scope, decl.callee);
     name = func.name;
   }
 
@@ -1836,7 +1876,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       const valTmp = localTmp(scope, '#call_val');
       const typeTmp = localTmp(scope, '#call_type', Valtype.i32);
 
-      return generateCall(scope, {
+      return generate(scope, {
         type: 'CallExpression',
         callee: target,
         arguments: decl.arguments.slice(1),
@@ -1939,7 +1979,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
         if (type == null) continue;
 
-        protoBC[type] = generateCall(scope, {
+        protoBC[type] = generate(scope, {
+          type: 'CallExpression',
           callee: {
             type: 'Identifier',
             name: x
@@ -2233,11 +2274,22 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ];
       }
 
+      let callee = decl.callee, callAsNew = decl._new, overrideThisWasm = decl._thisWasm;
+      if (callee.type === 'Super') {
+        // call super constructor with direct super() call
+        callee = getObjProp(callee, 'constructor');
+        callAsNew = true;
+        overrideThisWasm = [
+          ...generate(scope, { type: 'ThisExpression' }),
+          ...getNodeType(scope, { type: 'ThisExpression' })
+        ];
+      }
+
       const newTargetWasm = decl._newTargetWasm ?? createNewTarget(scope, decl, [
         [ Opcodes.local_get, funcLocal ],
         Opcodes.i32_from_u
-      ]);
-      const thisWasm = decl._thisWasm ?? createThisArg(scope, decl, knownThis);
+      ], callAsNew);
+      const thisWasm = overrideThisWasm ?? createThisArg(scope, decl, knownThis);
 
       const gen = argc => {
         const argsOut = [];
@@ -2305,11 +2357,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       return [
         ...(getCalleeObj ? [
           ...initCalleeObj,
-          ...generateMember(scope, decl.callee, false, undefined, getCalleeObj)
-        ]: generate(scope, decl.callee)),
+          ...generate(scope, callee, false, undefined, getCalleeObj)
+        ]: generate(scope, callee)),
         [ Opcodes.local_set, localTmp(scope, '#indirect_callee') ],
 
-        ...typeSwitch(scope, getNodeType(scope, decl.callee), {
+        ...typeSwitch(scope, getNodeType(scope, callee), {
           [TYPES.function]: [
             ...out,
 
@@ -2327,7 +2379,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
             [ Opcodes.local_set, flags ],
 
             // check if non-constructor was called with new, if so throw
-            ...(decl._new ? [
+            ...(callAsNew ? [
               [ Opcodes.local_get, flags ],
               ...number(0b10, Valtype.i32),
               [ Opcodes.i32_and ],
@@ -2535,6 +2587,9 @@ const generateThis = (scope, decl) => {
   ];
 };
 
+const generateSuper = (scope, decl) => generate(scope,
+  getObjProp(getObjProp({ type: 'ThisExpression', _noGlobalThis: true }, '__proto__'), '__proto__'));
+
 // bad hack for undefined and null working without additional logic
 const DEFAULT_VALUE = () => ({
   type: 'Identifier',
@@ -2892,7 +2947,7 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
       // hack for let a = function () { ... }
       if (!init.id) {
         init.id = { name };
-        generateFunc(scope, init, true);
+        generateFunc(scope, init);
         return out;
       }
     }
@@ -3543,7 +3598,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
 const ifIdentifierErrors = (scope, decl) => {
   if (decl.type === 'Identifier') {
-    const out = generateIdent(scope, decl);
+    const out = generate(scope, decl);
     if (out[1]) return true;
   }
 
@@ -3620,7 +3675,7 @@ const generateUnary = (scope, decl) => {
       let toReturn = true, toGenerate = true;
 
       if (decl.argument.type === 'Identifier') {
-        const out = generateIdent(scope, decl.argument);
+        const out = generate(scope, decl.argument);
 
         // if ReferenceError (undeclared var), ignore and return true. otherwise false
         if (!out[1]) {
@@ -4397,7 +4452,7 @@ const generateSwitch = (scope, decl) => {
       const ret = typeSwitch(scope, getNodeType(scope, decl.discriminant.arguments[0]), () => {
         const ret = [];
         for (const [type, consequent] of cases) {
-          const o = generateCode(scope, { body: consequent });
+          const o = generate(scope, { type: 'BlockStatement', body: consequent });
           ret.push([type, o]);
         }
         return ret;
@@ -4440,7 +4495,7 @@ const generateSwitch = (scope, decl) => {
     depth.pop();
     out.push(
       [ Opcodes.end ],
-      ...generateCode(scope, { body: cases[i].consequent })
+      ...generate(scope, { type: 'BlockStatement', body: cases[i].consequent })
     );
   }
 
@@ -5042,7 +5097,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
 
       if (type === 'SpreadElement') {
         out.push(
-          ...generateCall(scope, {
+          ...generate(scope, {
             type: 'CallExpression',
             callee: {
               type: 'Identifier',
@@ -5237,7 +5292,8 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
         const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
         if (type == null) continue;
 
-        if (type === known) return generateCall(scope, {
+        if (type === known) return generate(scope, {
+          type: 'CallExpression',
           callee: {
             type: 'Identifier',
             name: x
@@ -5246,7 +5302,8 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
           _protoInternalCall: true
         });
 
-        bc[type] = generateCall(scope, {
+        bc[type] = generate(scope, {
+          type: 'CallExpression',
           callee: {
             type: 'Identifier',
             name: x
@@ -5281,7 +5338,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       };
 
       bc[type] = [
-        ...generateIdent(scope, ident),
+        ...generate(scope, ident),
         ...setLastType(scope, getNodeType(scope, ident))
       ];
       if (type === known) return bc[type];
@@ -5512,7 +5569,7 @@ const generateAwait = (scope, decl) => {
 
   // todo: warn here if -d?
 
-  return generateCall(scope, {
+  return generate(scope, {
     type: 'CallExpression',
     callee: {
       type: 'Identifier',
@@ -5585,7 +5642,7 @@ const generateClass = (scope, decl) => {
 
     const k = getProperty(x, true);
 
-    let initKind = 'init';
+    let initKind = type === 'MethodDefinition' ? 'method' : 'value';
     if (kind === 'get' || kind === 'set') initKind = kind;
 
     // default value to undefined
@@ -5628,10 +5685,10 @@ const generateClass = (scope, decl) => {
       ...toPropertyKey(outScope, generate(outScope, k), getNodeType(outScope, k), computed, true),
 
       ...generate(outScope, value),
-      ...(initKind !== 'init' ? [ Opcodes.i32_to_u ] : []),
+      ...(initKind !== 'value' && initKind !== 'method' ? [ Opcodes.i32_to_u ] : []),
       ...getNodeType(outScope, value),
 
-      [ Opcodes.call, includeBuiltin(outScope, `__Porffor_object_expr_${initKind}`).index ],
+      [ Opcodes.call, includeBuiltin(outScope, `__Porffor_object_class_${initKind}`).index ],
 
       [ Opcodes.drop ],
       [ Opcodes.drop ]
@@ -5748,7 +5805,7 @@ const funcByIndex = idx => {
 };
 const funcByName = name => funcByIndex(funcIndex[name]);
 
-const generateFunc = (scope, decl, outUnused = false) => {
+const generateFunc = (scope, decl) => {
   const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
   if (decl.type.startsWith('Class')) {
     const out = generateClass(scope, {
@@ -5757,6 +5814,7 @@ const generateFunc = (scope, decl, outUnused = false) => {
     });
 
     const func = funcByName(name);
+    astCache.set(decl, out);
     return [ func, out ];
   }
 
@@ -5834,21 +5892,6 @@ const generateFunc = (scope, decl, outUnused = false) => {
         // todo: wrap in try and reject thrown value once supported
       }
 
-      if (!globalThis.precompile && func.constr && !func._onlyThisMethod) {
-        wasm.unshift(
-          // opt: do not check for pure constructors
-          ...(func._onlyConstr ? [] : [
-            // if being constructed
-            [ Opcodes.local_get, func.locals['#newtarget'].idx ],
-            Opcodes.i32_to_u,
-            [ Opcodes.if, Blocktype.void ],
-          ]),
-            // set prototype of this ;)
-            ...generate(func, setObjProp({ type: 'ThisExpression', _noGlobalThis: true }, '__proto__', getObjProp(func.name, 'prototype'))),
-          ...(func._onlyConstr ? [] : [ [ Opcodes.end ] ])
-        );
-      }
-
       if (name === 'main') {
         func.gotLastType = true;
         func.export = true;
@@ -6004,7 +6047,8 @@ const generateFunc = (scope, decl, outUnused = false) => {
   // force generate all for precompile
   if (globalThis.precompile) func.generate();
 
-  const out = decl.type.endsWith('Expression') && !outUnused ? funcRef(func) : [];
+  const out = decl.type.endsWith('Expression') ? funcRef(func) : [];
+  astCache.set(decl, out);
   return [ func, out ];
 };
 

package/compiler/precompile.js

@@ -62,6 +62,8 @@ const compile = async (file, _funcs) => {
     __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_class_value: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_class_method: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, 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.6+732d836d7",
+  "version": "0.37.0+44ce75202",
   "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.6+732d836d7';
+globalThis.version = '0.37.0+44ce75202';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {