porffor 0.2.0-eeb45f8 → 0.2.0-fbab1de

package/README.md

@@ -121,7 +121,7 @@ No particular order and no guarentees, just what could happen soon™
   - *Basic* Wasm engine (interpreter) in JS
 - More math operators (`**`, etc)
 - `do { ... } while (...)`
-- Rewrite `console.log` to work with strings/arrays
+- Typed export inputs (array)
 - Exceptions
   - Rewrite to use actual strings (optional?)
   - `try { } finally { }`
@@ -130,7 +130,7 @@ No particular order and no guarentees, just what could happen soon™
   - Rewrite local indexes per func for smallest local header and remove unused idxs
   - Smarter inline selection (snapshots?)
   - Remove const ifs (`if (true)`, etc)
-  - Experiment with byte strings?
+  - Memory alignment
 - Runtime
   - WASI target
   - Run precompiled Wasm file if given
@@ -147,7 +147,7 @@ No particular order and no guarentees, just what could happen soon™
 - Self hosted testing?
 
 ## Performance
-*For the things it supports most of the time*, Porffor is blazingly fast compared to most interpreters, and common engines running without JIT. For those with JIT, it is not that much slower like a traditional interpreter would be; mostly the same or a bit faster/slower depending on what.
+*For the things it supports most of the time*, Porffor is *blazingly fast* compared to most interpreters, and common engines running without JIT. For those with JIT, it is usually slower by default, but can catch up with compiler arguments and typed input.
 
 ![Screenshot of comparison chart](https://github.com/CanadaHonk/porffor/assets/19228318/76c75264-cc68-4be1-8891-c06dc389d97a)
 

package/compiler/codeGen.js

@@ -1175,7 +1175,7 @@ const getNodeType = (scope, node) => {
         const spl = name.slice(2).split('_');
 
         const func = spl[spl.length - 1];
-        const protoFuncs = Object.values(prototypeFuncs).filter(x => x[func] != null);
+        const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES._bytestring && prototypeFuncs[x][func] != null);
         if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
       }
 
@@ -1260,6 +1260,10 @@ const getNodeType = (scope, node) => {
       // hack: if something.length, number type
       if (node.property.name === 'length') return TYPES.number;
 
+      // ts hack
+      if (scope.locals[node.object.name]?.metadata?.type === TYPES.string) return TYPES.string;
+      if (scope.locals[node.object.name]?.metadata?.type === TYPES._array) return TYPES.number;
+
       if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
       // presume
@@ -1279,23 +1283,6 @@ const getNodeType = (scope, node) => {
   return ret;
 };
 
-const toString = (scope, wasm, type) => {
-  const tmp = localTmp(scope, '#tostring_tmp');
-  return [
-    ...wasm,
-    [ Opcodes.local_set, tmp ],
-
-    ...typeSwitch(scope, type, {
-      [TYPES.string]: [
-        [ Opcodes.local_get, tmp ]
-      ],
-      [TYPES.undefined]: [
-        // [ Opcodes.]
-      ]
-    })
-  ]
-};
-
 const generateLiteral = (scope, decl, global, name) => {
   if (decl.value === null) return number(NULL);
 
@@ -1486,8 +1473,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   // literal.func()
   if (!name && decl.callee.type === 'MemberExpression') {
     // megahack for /regex/.func()
-    if (decl.callee.object.regex) {
-      const funcName = decl.callee.property.name;
+    const funcName = decl.callee.property.name;
+    if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
       const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
 
       funcIndex[func.name] = func.index;
@@ -1529,8 +1516,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   if (protoName) {
     const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
-      const f = prototypeFuncs[x][protoName];
-      if (f) acc[x] = f;
+      if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
       return acc;
     }, {});
 
@@ -1928,6 +1914,8 @@ const extractTypeAnnotation = decl => {
   const typeName = type;
   type = typeAnnoToPorfType(type);
 
+  if (type === TYPES._bytestring && !process.argv.includes('-bytestring')) type = TYPES.string;
+
   // if (decl.name) console.log(decl.name, { type, elementType });
 
   return { type, typeName, elementType };
@@ -2327,8 +2315,10 @@ const generateFor = (scope, decl) => {
   out.push([ Opcodes.loop, Blocktype.void ]);
   depth.push('for');
 
-  out.push(...generate(scope, decl.test));
-  out.push(Opcodes.i32_to, [ Opcodes.if, Blocktype.void ]);
+  if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
+    else out.push(...number(1, Valtype.i32));
+
+  out.push([ Opcodes.if, Blocktype.void ]);
   depth.push('if');
 
   out.push([ Opcodes.block, Blocktype.void ]);
@@ -2336,8 +2326,7 @@ const generateFor = (scope, decl) => {
   out.push(...generate(scope, decl.body));
   out.push([ Opcodes.end ]);
 
-  out.push(...generate(scope, decl.update));
-  depth.pop();
+  if (decl.update) out.push(...generate(scope, decl.update));
 
   out.push([ Opcodes.br, 1 ]);
   out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2535,7 +2524,7 @@ const generateThrow = (scope, decl) => {
   // hack: throw new X("...") -> throw "..."
   if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
     constructor = decl.argument.callee.name;
-    message = decl.argument.arguments[0].value;
+    message = decl.argument.arguments[0]?.value ?? '';
   }
 
   if (tags.length === 0) tags.push({
@@ -2887,11 +2876,14 @@ const objectHack = node => {
     // if object is not identifier or another member exp, give up
     if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
 
-    if (!objectName) objectName = objectHack(node.object).name.slice(2);
+    if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
 
     // if .length, give up (hack within a hack!)
     if (node.property.name === 'length') return node;
 
+    // no object name, give up
+    if (!objectName) return node;
+
     const name = '__' + objectName + '_' + node.property.name;
     if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 

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.2.0-eeb45f8",
+  "version": "0.2.0-fbab1de",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/r.js

@@ -0,0 +1,9 @@
+var count = 0;
+for (let x = 0; x < 10;) {
+  x++;
+  count++;
+  {
+    let x = "hello";
+    continue;
+  }
+}