porffor 0.31.0 → 0.33.1

package/compiler/builtins/_internal_object.ts

@@ -548,7 +548,8 @@ export const __Porffor_object_isObjectOrSymbol = (arg: any): boolean => {
 
 
 // used for { foo: 5 }
-export const __Porffor_object_expr_init = (obj: object, key: any, value: any): void => {
+export const __Porffor_object_expr_init = (obj: any, key: any, value: any): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     // add new entry
@@ -573,7 +574,8 @@ export const __Porffor_object_expr_init = (obj: object, key: any, value: any): v
 };
 
 // used for { get foo() {} }
-export const __Porffor_object_expr_get = (obj: object, key: any, get: any): void => {
+export const __Porffor_object_expr_get = (obj: any, key: any, get: any): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let set: any = undefined;
   if (entryPtr == -1) {
@@ -602,7 +604,8 @@ export const __Porffor_object_expr_get = (obj: object, key: any, get: any): void
 };
 
 // used for { set foo(v) {} }
-export const __Porffor_object_expr_set = (obj: object, key: any, set: any): void => {
+export const __Porffor_object_expr_set = (obj: any, key: any, set: any): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let get: any = undefined;
   if (entryPtr == -1) {

package/compiler/builtins_precompiled.js

@@ -96,19 +96,19 @@ params:[127,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127],localNames:["arg","arg#type","t"],
 };
 this.__Porffor_object_expr_init = {
-wasm:(_,{builtin})=>[[32,0],[65,7],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[34,6],[65,127],[70],[4,64],[32,0],[40,0,0],[33,8],[32,0],[32,8],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,8],[65,14],[108],[106],[34,6],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,7],[26],[11],[32,6],[32,4],[57,0,4],[32,6],[65,14],[32,5],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
+wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_getObject')],[33,6],[252,2],[34,0],[32,6],[33,1],[26],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[34,7],[65,127],[70],[4,64],[32,0],[40,0,0],[33,8],[32,0],[32,8],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,8],[65,14],[108],[106],[34,7],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,6],[26],[11],[32,7],[32,4],[57,0,4],[32,7],[65,14],[32,5],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
 params:[127,127,127,127,124,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","entryPtr","#last_type","size"],
+locals:[127,127,127],localNames:["obj","obj#type","key","key#type","value","value#type","#last_type","entryPtr","size"],
 };
 this.__Porffor_object_expr_get = {
-wasm:(_,{builtin})=>[[32,0],[65,7],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[33,6],[65,0],[33,8],[65,128,1],[33,9],[32,6],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,6],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,7],[26],[5],[32,6],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,9],[33,8],[11],[32,6],[32,4],[32,5],[32,8],[32,9],[16,builtin('__Porffor_object_packAccessor')],[33,7],[57,0,4],[32,6],[65,15],[65,1],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
+wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_getObject')],[33,6],[252,2],[34,0],[32,6],[33,1],[26],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[33,7],[65,0],[33,8],[65,128,1],[33,9],[32,7],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,7],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,6],[26],[5],[32,7],[65,1],[16,builtin('__Porffor_object_accessorSet')],[33,9],[33,8],[11],[32,7],[32,4],[32,5],[32,8],[32,9],[16,builtin('__Porffor_object_packAccessor')],[33,6],[57,0,4],[32,7],[65,15],[65,1],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
 params:[127,127,127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127,127,127],localNames:["obj","obj#type","key","key#type","get","get#type","entryPtr","#last_type","set","set#type","size"],
+locals:[127,127,127,127,127],localNames:["obj","obj#type","key","key#type","get","get#type","#last_type","entryPtr","set","set#type","size"],
 };
 this.__Porffor_object_expr_set = {
-wasm:(_,{builtin})=>[[32,0],[65,7],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[33,6],[65,0],[33,8],[65,128,1],[33,9],[32,6],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,6],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,7],[26],[5],[32,6],[65,1],[16,builtin('__Porffor_object_accessorGet')],[33,9],[33,8],[11],[32,6],[32,8],[32,9],[32,4],[32,5],[16,builtin('__Porffor_object_packAccessor')],[33,7],[57,0,4],[32,6],[65,15],[65,1],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
+wasm:(_,{builtin})=>[[32,1],[65,7],[71],[4,64],[32,0],[184],[32,1],[16,builtin('__Porffor_object_getObject')],[33,6],[252,2],[34,0],[32,6],[33,1],[26],[11],[32,0],[32,1],[32,2],[32,3],[16,builtin('__Porffor_object_lookup')],[26],[33,7],[65,0],[33,8],[65,128,1],[33,9],[32,7],[65,127],[70],[4,64],[32,0],[40,0,0],[33,10],[32,0],[32,10],[65,1],[106],[54,0,0],[32,0],[65,5],[106],[32,10],[65,14],[108],[106],[34,7],[65,1],[32,2],[32,3],[16,builtin('__Porffor_object_writeKey')],[33,6],[26],[5],[32,7],[65,1],[16,builtin('__Porffor_object_accessorGet')],[33,9],[33,8],[11],[32,7],[32,8],[32,9],[32,4],[32,5],[16,builtin('__Porffor_object_packAccessor')],[33,6],[57,0,4],[32,7],[65,15],[65,1],[65,8],[116],[106],[59,0,12],[65,0],[65,128,1],[15]],
 params:[127,127,127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
-locals:[127,127,127,127,127],localNames:["obj","obj#type","key","key#type","set","set#type","entryPtr","#last_type","get","get#type","size"],
+locals:[127,127,127,127,127],localNames:["obj","obj#type","key","key#type","set","set#type","#last_type","entryPtr","get","get#type","size"],
 };
 this.__String_prototype_big = {
 wasm:(_,{allocPage})=>[...number(allocPage(_,'string: __String_prototype_big/out','i16')*pageSize,127),[34,2],[65,10],[106],[33,3],[32,0],[33,4],[32,0],[40,1,0],[33,5],[32,4],[32,5],[65,2],[108],[106],[33,6],[3,64],[32,4],[32,6],[72],[4,64],[32,4],[47,0,4],[33,7],[32,3],[32,7],[59,0,4],[32,4],[65,2],[106],[33,4],[32,3],[65,2],[106],[33,3],[12,1],[11],[11],[32,3],[65,60],[59,0,4],[32,3],[65,47],[59,0,6],[32,3],[65,226,0],[59,0,8],[32,3],[65,233,0],[59,0,10],[32,3],[65,231,0],[59,0,12],[32,3],[65,62],[59,0,14],[32,2],[34,9],[32,5],[65,11],[106],[34,8],[54,1,0],[32,2],[65,195,0],[15]],

package/compiler/codegen.js

@@ -37,7 +37,8 @@ const todo = (scope, msg, expectsValue = undefined) => {
 };
 
 const isFuncType = type =>
-  type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
+  type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression' ||
+  type === 'ClassDeclaration' || type === 'ClassExpression';
 const hasFuncWithName = name =>
   Object.hasOwn(funcIndex, name) || Object.hasOwn(builtinFuncs, name) || Object.hasOwn(importedFuncs, name) || Object.hasOwn(internalConstrs, name);
 
@@ -71,13 +72,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'ArrowFunctionExpression':
     case 'FunctionDeclaration':
     case 'FunctionExpression':
-      const func = generateFunc(scope, decl);
-
-      if (decl.type.endsWith('Expression')) {
-        return cacheAst(decl, funcRef(func.index, func.name));
-      }
-
-      return cacheAst(decl, []);
+      return cacheAst(decl, generateFunc(scope, decl)[1]);
 
     case 'BlockStatement':
       return cacheAst(decl, generateCode(scope, decl));
@@ -175,6 +170,10 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'MemberExpression':
       return cacheAst(decl, generateMember(scope, decl, global, name));
 
+    case 'ClassExpression':
+    case 'ClassDeclaration':
+      return cacheAst(decl, generateClass(scope, decl));
+
     case 'ExportNamedDeclaration':
       if (!decl.declaration) return todo(scope, 'unsupported export declaration');
 
@@ -1696,12 +1695,12 @@ const getNodeType = (scope, node) => {
       }
     }
 
-    if (node.type == 'ThisExpression') {
+    if (node.type === 'ThisExpression') {
       if (!scope.constr) return getType(scope, 'globalThis');
       return [ [ Opcodes.local_get, '#this#type' ] ];
     }
 
-    if (node.type == 'MetaProperty') {
+    if (node.type === 'MetaProperty') {
       switch (`${node.meta.name}.${node.property.name}`) {
         case 'new.target': {
           return [ [ Opcodes.local_get, '#newtarget#type' ] ];
@@ -2002,9 +2001,12 @@ const createThisArg = (scope, decl, knownThis = undefined) => {
 };
 
 const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
+  let out = [];
   let name = mapName(decl.callee.name);
-  if (isFuncType(decl.callee.type)) { // iife
-    const func = generateFunc(scope, decl.callee);
+
+  // opt: virtualize iifes
+  if (isFuncType(decl.callee.type)) {
+    const [ func ] = generateFunc(scope, decl.callee);
     name = func.name;
   }
 
@@ -2102,7 +2104,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     target = decl.callee.object;
   }
 
-  let out = [];
   if (protoName) {
     if (protoName === 'call') {
       const valTmp = localTmp(scope, '#call_val');
@@ -5765,6 +5766,87 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
   return out;
 };
 
+const generateClass = (scope, decl) => {
+  const expr = decl.type === 'ClassExpression';
+  if (decl.superClass) return todo(scope, 'class extends is not supported yet', expr);
+
+  const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
+  if (name == null) return todo(scope, 'unknown name for class', expr);
+
+  const body = decl.body.body;
+  const root = {
+    type: 'Identifier',
+    name
+  };
+
+  const constr = body.find(x => x.kind === 'constructor')?.value ?? {
+    type: 'FunctionExpression',
+    id: root,
+    params: [],
+    body: {
+      type: 'BlockStatement',
+      body: []
+    }
+  };
+
+  const [ func, out ] = generateFunc(scope, {
+    ...constr,
+    _onlyConstr: `Class constructor ${name} requires 'new'`,
+    type: expr ? 'FunctionExpression' : 'FunctionDeclaration'
+  });
+
+  for (const x of body) {
+    let { type, key, value, kind, static: _static, computed } = x;
+    if (type !== 'MethodDefinition' && type !== 'PropertyDefinition') return todo(scope, `class body type ${type} is not supported yet`, expr);
+
+    if (kind === 'constructor') continue;
+
+    const object = _static ? root : {
+      type: 'MemberExpression',
+      object: root,
+      property: {
+        type: 'Identifier',
+        name: 'prototype'
+      },
+      computed: false,
+      optional: false
+    };
+
+    let k = key;
+    if (!computed && key.type !== 'Literal') k = {
+      type: 'Literal',
+      value: key.name
+    };
+
+    let initKind = 'init';
+    if (kind === 'get' || kind === 'set') initKind = kind;
+
+    // default value to undefined
+    value ??= DEFAULT_VALUE();
+
+    out.push(
+      ...generate(scope, object),
+      Opcodes.i32_to_u,
+      ...getNodeType(scope, object),
+
+      ...generate(scope, k),
+      ...getNodeType(scope, k),
+      ...toPropertyKey(scope, true),
+
+      ...generate(scope, value),
+      ...(initKind !== 'init' ? [ Opcodes.i32_to_u ] : []),
+      ...getNodeType(scope, value),
+
+      [ Opcodes.call, includeBuiltin(scope, `__Porffor_object_expr_${initKind}`).index ],
+
+      [ Opcodes.drop ],
+      [ Opcodes.drop ]
+    );
+  }
+
+  return out;
+};
+
 globalThis._uniqId = 0;
 const uniqId = () => '_' + globalThis._uniqId++;
 
@@ -5816,6 +5898,16 @@ const objectHack = node => {
 
 const generateFunc = (scope, decl) => {
   const name = decl.id ? decl.id.name : `#anonymous${uniqId()}`;
+  if (decl.type.startsWith('Class')) {
+    const out = generateClass(scope, {
+      ...decl,
+      id: { name }
+    });
+
+    const func = funcs.find(x => x.name === name);
+    return [ func, out ];
+  }
+
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!
@@ -5837,6 +5929,8 @@ const generateFunc = (scope, decl) => {
   funcIndex[name] = func.index;
   funcs.push(func);
 
+  const out = decl.type.endsWith('Expression') ? funcRef(func.index, func.name) : [];
+
   let errorWasm = null;
   if (decl.generator) errorWasm = todo(scope, 'generator functions are not supported');
 
@@ -5847,7 +5941,7 @@ const generateFunc = (scope, decl) => {
     ]);
     func.params = [];
     func.constr = false;
-    return func;
+    return [ func, out ];
   }
 
   if (typedInput && decl.returnType) {
@@ -5977,17 +6071,39 @@ const generateFunc = (scope, decl) => {
     );
   }
 
+  if (decl._onlyConstr) {
+    wasm.unshift(
+      // error if not being constructed
+      [ Opcodes.local_get, '#newtarget' ],
+      Opcodes.i32_to_u,
+      [ Opcodes.i32_eqz ],
+      [ Opcodes.if, Blocktype.void ],
+        ...internalThrow(func, 'TypeError', decl._onlyConstr),
+      [ Opcodes.end ]
+    );
+  }
+
   if (name === 'main') {
     func.gotLastType = true;
     func.export = true;
     func.returns = [ valtypeBinary, Valtype.i32 ];
 
+    let finalStatement = decl.body.body[decl.body.body.length - 1];
+    if (finalStatement?.type === 'EmptyStatement') finalStatement = decl.body.body[decl.body.body.length - 2];
+
     const lastInst = func.wasm[func.wasm.length - 1] ?? [ Opcodes.end ];
     if (lastInst[0] === Opcodes.drop) {
-      func.wasm.splice(func.wasm.length - 1, 1);
-
-      const finalStatement = decl.body.body[decl.body.body.length - 1];
-      func.wasm.push(...getNodeType(func, finalStatement));
+      if (finalStatement.type.endsWith('Declaration')) {
+        // final statement is decl, force undefined
+        disposeLeftover(wasm);
+        func.wasm.push(
+          ...number(UNDEFINED),
+          ...number(TYPES.undefined, Valtype.i32)
+        );
+      } else {
+        func.wasm.splice(func.wasm.length - 1, 1);
+        func.wasm.push(...getNodeType(func, finalStatement));
+      }
     }
 
     if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
@@ -6050,7 +6166,7 @@ const generateFunc = (scope, decl) => {
     }
   }
 
-  return func;
+  return [ func, out ];
 };
 
 const generateCode = (scope, decl) => {
@@ -6266,7 +6382,7 @@ export default program => {
 
   if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
 
-  const main = generateFunc(scope, program);
+  const [ main ] = generateFunc(scope, program);
 
   delete globals['#ind'];
 

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