porffor 0.0.0-1989c22 → 0.0.0-44bc2d8

package/README.md

@@ -76,6 +76,7 @@ these include some early (stage 1/0) and/or dead (last commit years ago) proposa
 - string member (char) access via `str[ind]` (eg `str[0]`)
 - string concat (`+`) (eg `'a' + 'b'`)
 - truthy/falsy (eg `!'' == true`)
+- string comparison (eg `'a' == 'a'`, `'a' != 'b'`)
 
 ### built-ins
 
@@ -106,7 +107,6 @@ these include some early (stage 1/0) and/or dead (last commit years ago) proposa
   - arrays/strings inside arrays
 - strings
   - member setting
-  - equality
 - more math operators (`**`, etc)
 - `do { ... } while (...)`
 - exceptions

package/compiler/codeGen.js

@@ -101,6 +101,9 @@ const generate = (scope, decl, global = false, name = undefined) => {
     case 'WhileStatement':
       return generateWhile(scope, decl);
 
+    /* case 'ForOfStatement':
+      return generateForOf(scope, decl); */
+
     case 'BreakStatement':
       return generateBreak(scope, decl);
 
@@ -472,9 +475,6 @@ const compareStrings = (scope, left, right) => {
   const indexEnd = localTmp(scope, 'compare_index_end', Valtype.i32);
 
   return [
-    // use block to "return" a value early
-    [ Opcodes.block, Valtype.i32 ],
-
     // setup left
     ...left,
     Opcodes.i32_to_u,
@@ -486,11 +486,9 @@ const compareStrings = (scope, left, right) => {
     [ Opcodes.local_tee, rightPointer ],
 
     // fast path: check leftPointer == rightPointer
-    [ Opcodes.i32_eq ],
-    [ Opcodes.if, Blocktype.void ],
-    ...number(1, Valtype.i32),
-    [ Opcodes.br, 1 ],
-    [ Opcodes.end ],
+    // use if (block) for everything after to "return" a value early
+    [ Opcodes.i32_ne ],
+    [ Opcodes.if, Valtype.i32 ],
 
     // get lengths
     [ Opcodes.local_get, leftPointer ],
@@ -553,6 +551,10 @@ const compareStrings = (scope, left, right) => {
 
     // no failed checks, so true!
     ...number(1, Valtype.i32),
+
+    // pointers match, so true
+    [ Opcodes.else ],
+    ...number(1, Valtype.i32),
     [ Opcodes.end ],
 
     // convert i32 result to valtype
@@ -1552,6 +1554,25 @@ const generateWhile = (scope, decl) => {
   return out;
 };
 
+const generateForOf = (scope, decl) => {
+  const out = [];
+
+  out.push([ Opcodes.loop, Blocktype.void ]);
+  depth.push('while');
+
+  out.push(...generate(scope, decl.test));
+  out.push(Opcodes.i32_to, [ Opcodes.if, Blocktype.void ]);
+  depth.push('if');
+
+  out.push(...generate(scope, decl.body));
+
+  out.push([ Opcodes.br, 1 ]);
+  out.push([ Opcodes.end ], [ Opcodes.end ]);
+  depth.pop(); depth.pop();
+
+  return out;
+};
+
 const getNearestLoop = () => {
   for (let i = depth.length - 1; i >= 0; i--) {
     if (depth[i] === 'while' || depth[i] === 'for' || depth[i] === 'forof') return i;

package/compiler/opt.js

@@ -20,7 +20,7 @@ export default (funcs, globals) => {
   if (optLevel === 0) return;
 
   const tailCall = process.argv.includes('-tail-call');
-  if (tailCall) log('opt', 'tail call proposal is not widely implemented! (you used -tail-call)');
+  if (tailCall) log('opt', 'warning: tail call proposal is not widely implemented! (you used -tail-call)');
 
   if (optLevel >= 2 && !process.argv.includes('-opt-no-inline')) {
     // inline pass (very WIP)

package/compiler/sections.js

@@ -36,7 +36,7 @@ export default (funcs, globals, tags, pages, flags) => {
     // tree shake imports
     for (const f of funcs) {
       for (const inst of f.wasm) {
-        if (inst[0] === Opcodes.call && inst[1] < importedFuncs.length) {
+        if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] < importedFuncs.length) {
           const idx = inst[1];
           const func = importedFuncs[idx];
 
@@ -51,10 +51,11 @@ export default (funcs, globals, tags, pages, flags) => {
     // fix call indexes for non-imports
     const delta = importedFuncs.length - importFuncs.length;
     for (const f of funcs) {
+      f.originalIndex = f.index;
       f.index -= delta;
 
       for (const inst of f.wasm) {
-        if (inst[0] === Opcodes.call && inst[1] >= importedFuncs.length) {
+        if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
           inst[1] -= delta;
         }
       }

package/compiler/wrap.js

@@ -90,6 +90,15 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
             return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
           }
 
+          case 'function': {
+            // wasm func index, including all imports
+            const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
+            if (!func) return ret;
+
+            // make fake empty func for repl/etc
+            return {[func.name]() {}}[func.name];
+          }
+
           default: return ret;
         }
       } catch (e) {

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.0.0-1989c22",
+  "version": "0.0.0-44bc2d8",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/runner/repl.js

@@ -48,10 +48,12 @@ const memoryToString = mem => {
   return out;
 };
 
+const alwaysPrev = process.argv.includes('-always-prev');
+
 let prev = '';
 const run = async (source, _context, _filename, callback, run = true) => {
   let toRun = prev + source.trim();
-  // prev = toRun + ';\n';
+  if (alwaysPrev) prev = toRun + ';\n';
 
   const { exports, wasm, pages } = await compile(toRun, []);
   fs.writeFileSync('out.wasm', Buffer.from(wasm));
@@ -64,7 +66,7 @@ const run = async (source, _context, _filename, callback, run = true) => {
   const ret = run ? exports.main() : undefined;
   callback(null, ret);
 
-  if (source.includes(' = ') || source.includes('let ') || source.includes('var ') || source.includes('const ') || source.includes('function ')) prev = toRun + ';\n';
+  if (!alwaysPrev && (source.includes(' = ') || source.includes('let ') || source.includes('var ') || source.includes('const ') || source.includes('function '))) prev = toRun + ';\n';
   // prev = toRun + ';\n';
 };