porffor 0.41.3 → 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') ||
@@ -1823,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;
 
@@ -2606,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
@@ -5908,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++;
 

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