porffor 0.41.2 → 0.41.4

package/compiler/codegen.js

@@ -96,10 +96,8 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateChain(scope, decl));
 
     case 'CallExpression':
-      return cacheAst(decl, generateCall(scope, decl, global, name, valueUnused));
-
     case 'NewExpression':
-      return cacheAst(decl, generateNew(scope, decl, global, name));
+      return cacheAst(decl, generateCall(scope, decl, global, name, valueUnused));
 
     case 'ThisExpression':
       return cacheAst(decl, generateThis(scope, decl));
@@ -189,6 +187,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'TemplateLiteral':
       return cacheAst(decl, generateTemplate(scope, decl));
 
+    case 'TaggedTemplateExpression':
+      return cacheAst(decl, generateTaggedTemplate(scope, decl, global, name));
+
     case 'ExportNamedDeclaration':
       if (!decl.declaration) return todo(scope, 'unsupported export declaration');
 
@@ -209,79 +210,6 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
       return cacheAst(decl, []);
 
-    case 'TaggedTemplateExpression': {
-      const funcs = {
-        __Porffor_wasm: str => {
-          let out = [];
-
-          for (const line of str.split('\n')) {
-            const asm = line.trim().split(';;')[0].split(' ').filter(x => x);
-            if (!asm[0]) continue; // blank
-
-            if (asm[0] === 'local') {
-              const [ name, type ] = asm.slice(1);
-              scope.locals[name] = { idx: scope.localInd++, type: Valtype[type] };
-              continue;
-            }
-
-            if (asm[0] === 'returns') {
-              scope.returns = asm.slice(1).map(x => Valtype[x]);
-              continue;
-            }
-
-            let inst = Opcodes[asm[0].replace('.', '_')];
-            if (inst == null) throw new Error(`inline asm: inst ${asm[0]} not found`);
-            if (!Array.isArray(inst)) inst = [ inst ];
-
-            const immediates = asm.slice(1).map(x => {
-              const int = parseInt(x);
-              if (Number.isNaN(int)) {
-                if (builtinFuncs[x]) {
-                  if (funcIndex[x] == null) includeBuiltin(scope, x);
-                  return funcIndex[x];
-                }
-
-                return scope.locals[x]?.idx ?? globals[x].idx;
-              }
-              return int;
-            });
-
-            const encodeFunc = ({
-              [Opcodes.f64_const]: x => x,
-              [Opcodes.if]: unsignedLEB128,
-              [Opcodes.loop]: unsignedLEB128
-            })[inst[0]] ?? signedLEB128;
-            out.push([ ...inst, ...immediates.flatMap(x => encodeFunc(x)) ]);
-          }
-
-          return out;
-        },
-
-        __Porffor_bs: str => makeString(scope, str, global, name, true),
-        __Porffor_s: str => makeString(scope, str, global, name, false)
-      };
-
-      const func = decl.tag.name;
-      // hack for inline asm
-      if (!funcs[func]) return cacheAst(decl, todo(scope, 'tagged template expressions not implemented', true));
-
-      const { quasis, expressions } = decl.quasi;
-      let str = quasis[0].value.raw;
-
-      for (let i = 0; i < expressions.length; i++) {
-        const e = expressions[i];
-        if (!e.name) {
-          if (e.type === 'BinaryExpression' && e.operator === '+' && e.left.type === 'Identifier' && e.right.type === 'Literal') {
-            str += lookupName(scope, e.left.name)[0].idx + e.right.value;
-          } else todo(scope, 'unsupported expression in intrinsic');
-        } else str += lookupName(scope, e.name)[0].idx;
-
-        str += quasis[i + 1].value.raw;
-      }
-
-      return cacheAst(decl, funcs[func](str));
-    }
-
     default:
       // ignore typescript nodes
       if (decl.type.startsWith('TS') ||
@@ -601,18 +529,21 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMod
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   ...number(1, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
+
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
         ...number(1, intOut ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
+
       [ 'default', def ]
+
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(1, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -666,18 +597,21 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false, forceTruthyMode
         [ Opcodes.i32_eqz ],
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ] ],
-      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
-      // [ 'default', [
-      //   // other types are always truthy
-      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
-      //   ...number(0, intOut ? Valtype.i32 : valtypeBinary)
-      // ] ]
+
       ...(truthyMode === 'full' ? [ [ [ TYPES.booleanobject, TYPES.numberobject ], [
         // always truthy :))
         ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
         ...number(0, intOut ? Valtype.i32 : valtypeBinary)
       ] ] ] : []),
+
       [ 'default', def ]
+
+      // [ [ TYPES.boolean, TYPES.number, TYPES.object, TYPES.undefined, TYPES.empty ], def ],
+      // [ 'default', [
+      //   // other types are always truthy
+      //   ...(!useTmp ? [ [ Opcodes.drop ] ] : []),
+      //   ...number(0, intOut ? Valtype.i32 : valtypeBinary)
+      // ] ]
     ], intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
@@ -749,7 +683,8 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
   // todo: niche null hell with 0
 
   if ((knownLeft === TYPES.string || knownRight === TYPES.string) ||
-      (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)) {
+      (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) ||
+      (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)) {
     if (op === '+') {
       // string concat (a + b)
       return concatStrings(scope, left, right, leftType, rightType);
@@ -887,6 +822,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
         // switch primitive types to primitive object types
         if (checkType === TYPES.number) checkType = TYPES.numberobject;
         if (checkType === TYPES.boolean) checkType = TYPES.booleanobject;
+        if (checkType === TYPES.string) checkType = TYPES.stringobject;
 
         // currently unsupported types
         if ([TYPES.string].includes(checkType)) {
@@ -1269,6 +1205,14 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
+
+      // hack: special primitive object types
+      if (node.type === 'NewExpression') {
+        if (name === 'Number') return TYPES.numberobject;
+        if (name === 'Boolean') return TYPES.booleanobject;
+        if (name === 'String') return TYPES.stringobject;
+      }
+
       if (name == null) {
         // iife
         if (scope.locals['#last_type']) return getLastType(scope);
@@ -1375,11 +1319,14 @@ const getNodeType = (scope, node) => {
 
       if ((knownLeft != null || knownRight != null) && !(
         (knownLeft === TYPES.string || knownRight === TYPES.string) ||
-        (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
+        (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring) ||
+        (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)
       )) return TYPES.number;
 
-      if (knownLeft === TYPES.string || knownRight === TYPES.string)
-        return TYPES.string;
+      if (
+        (knownLeft === TYPES.string || knownRight === TYPES.string) ||
+        (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)
+      ) return TYPES.string;
 
       // guess bytestring, could really be bytestring or string
       if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
@@ -1727,6 +1674,7 @@ const aliasPrimObjsBC = bc => {
 
   add(TYPES.boolean, TYPES.booleanobject);
   add(TYPES.number, TYPES.numberobject);
+  add(TYPES.string, TYPES.stringobject);
 };
 
 const createThisArg = (scope, decl) => {
@@ -1803,6 +1751,8 @@ const createThisArg = (scope, decl) => {
 };
 
 const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
+  if (decl.type === 'NewExpression') decl._new = true;
+
   let out = [];
   let name = decl.callee.name;
 
@@ -2100,6 +2050,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         };
       }
 
+      // alias primitive prototype with primitive object types
+      aliasPrimObjsBC(protoBC);
+
       return [
         ...(usePointerCache ? [
           ...rawPointer,
@@ -2583,11 +2536,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   return out;
 };
 
-const generateNew = (scope, decl, _global, _name) => generateCall(scope, {
-  ...decl,
-  _new: true
-}, _global, _name);
-
 const generateThis = (scope, decl) => {
   if (!scope.constr) {
     // this in a non-constructor context is a reference to globalThis
@@ -5885,6 +5833,92 @@ export const generateTemplate = (scope, decl) => {
   return generate(scope, current);
 };
 
+const generateTaggedTemplate = (scope, decl, global = false, name = undefined) => {
+  const intrinsics = {
+    __Porffor_wasm: str => {
+      let out = [];
+
+      for (const line of str.split('\n')) {
+        const asm = line.trim().split(';;')[0].split(' ').filter(x => x);
+        if (!asm[0]) continue; // blank
+
+        if (asm[0] === 'local') {
+          const [ name, type ] = asm.slice(1);
+          scope.locals[name] = { idx: scope.localInd++, type: Valtype[type] };
+          continue;
+        }
+
+        if (asm[0] === 'returns') {
+          scope.returns = asm.slice(1).map(x => Valtype[x]);
+          continue;
+        }
+
+        let inst = Opcodes[asm[0].replace('.', '_')];
+        if (inst == null) throw new Error(`inline asm: inst ${asm[0]} not found`);
+        if (!Array.isArray(inst)) inst = [ inst ];
+
+        const immediates = asm.slice(1).map(x => {
+          const int = parseInt(x);
+          if (Number.isNaN(int)) {
+            if (builtinFuncs[x]) {
+              if (funcIndex[x] == null) includeBuiltin(scope, x);
+              return funcIndex[x];
+            }
+
+            return scope.locals[x]?.idx ?? globals[x].idx;
+          }
+          return int;
+        });
+
+        const encodeFunc = ({
+          [Opcodes.f64_const]: x => x,
+          [Opcodes.if]: unsignedLEB128,
+          [Opcodes.loop]: unsignedLEB128
+        })[inst[0]] ?? signedLEB128;
+        out.push([ ...inst, ...immediates.flatMap(x => encodeFunc(x)) ]);
+      }
+
+      return out;
+    },
+
+    __Porffor_bs: str => makeString(scope, str, global, name, true),
+    __Porffor_s: str => makeString(scope, str, global, name, false)
+  };
+
+  const { quasis, expressions } = decl.quasi;
+  if (intrinsics[decl.tag.name]) {
+    let str = quasis[0].value.raw;
+
+    for (let i = 0; i < expressions.length; i++) {
+      const e = expressions[i];
+      if (!e.name) {
+        if (e.type === 'BinaryExpression' && e.operator === '+' && e.left.type === 'Identifier' && e.right.type === 'Literal') {
+          str += lookupName(scope, e.left.name)[0].idx + e.right.value;
+        } else todo(scope, 'unsupported expression in intrinsic');
+      } else str += lookupName(scope, e.name)[0].idx;
+
+      str += quasis[i + 1].value.raw;
+    }
+
+    return cacheAst(decl, intrinsics[decl.tag.name](str));
+  }
+
+  return generate(scope, {
+    type: 'CallExpression',
+    callee: decl.tag,
+    arguments: [
+      { // strings
+        type: 'ArrayExpression',
+        elements: quasis.map(x => ({
+          type: 'Literal',
+          value: x.value.cooked
+        }))
+      },
+      ...expressions
+    ]
+  });
+};
+
 globalThis._uniqId = 0;
 const uniqId = () => '_' + globalThis._uniqId++;
 
@@ -6195,6 +6229,7 @@ const generateFunc = (scope, decl) => {
       ].includes(typeAnno.type)) {
         let types = [ typeAnno.type ];
         if (typeAnno.type === TYPES.number) types.push(TYPES.numberobject);
+        if (typeAnno.type === TYPES.string) types.push(TYPES.stringobject);
 
         prelude.push(
           ...typeIsNotOneOf([ [ Opcodes.local_get, func.locals[name].idx + 1 ] ], types),

package/compiler/types.js

@@ -76,6 +76,7 @@ registerInternalType('Promise');
 
 registerInternalType('BooleanObject');
 registerInternalType('NumberObject');
+registerInternalType('StringObject');
 
 registerInternalType('Error');
 registerInternalType('AggregateError');

package/compiler/wrap.js

@@ -159,6 +159,8 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       return Array.from(read(Uint8Array, memory, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
+    case TYPES.stringobject: return new String(porfToJSValue({ memory, funcs, pages }, value, TYPES.string));
+
     case TYPES.array: {
       let length = read(Uint32Array, memory, value, 1)[0];
       if (override) length = override;

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.41.2+5b89877a2",
+  "version": "0.41.4+e41715a96",
   "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.41.2+5b89877a2';
+globalThis.version = '0.41.4+e41715a96';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {