porffor 0.16.0-c86dc1d57 → 0.16.0-ec15a329e

package/CONTRIBUTING.md

@@ -206,6 +206,7 @@ Store the character code into the `out` pointer variable, and increment it.
 - You cannot use other functions in the file not exported, or variables not inside the current function.
 - `if (...)` uses a fast truthy implementation which is not spec-compliant as most conditions should be strictly checked. To use spec-compliant behavior, use `if (Boolean(...))`.
 - For object (string/array/etc) literals, you must use a variable eg `const out: bytestring = 'foobar'; console.log(out);` instead of `console.log('foobar')` due to precompile's allocator constraints.
+- Generally prefer/use non-strict equality ops (`==`/`!=`).
 
 <br>
 
@@ -232,7 +233,7 @@ builtins/tostring_number: impl radix
 
 ## Test262
 
-Make sure you have Test262 cloned already **inside of `test262/`** (`git clone https://github.com/tc39/test262.git test262/test262`) and run `npm install` inside `test262/` too.
+For the first time, ensure you run `./test262/setup.sh`.
 
 Run `node test262` to run all the tests and get an output of total overall test results.
 
@@ -246,7 +247,7 @@ The main thing you want to pay attention to is the emoji summary (lol):
 To break this down:
 🧪 total 🤠 pass ❌ fail 💀 runtime error 📝 todo (error) ⏰ timeout 🏗️ wasm compile error 💥 compile error
 
-The diff compared to the last commit (with test262 data) is shown in brackets. Basically, you can passes 🤠 up, and errors 💀📝🏗💥 down. It is fine if some errors change balance/etc, as long as they are not new failures.
+The diff compared to the last commit (with test262 data) is shown in brackets. Basically, you want passes 🤠 up, and errors 💀📝🏗💥 down. It is fine if some errors change balance/etc, as long as they are not new failures.
 
 It will also log new passes/fails. Be careful as sometimes the overall passes can increase, but other files have also regressed into failures which you might miss. Also keep in mind some tests may have been false positives before, but we can investigate the diff together :)
 

package/compiler/2c.js

@@ -29,8 +29,8 @@ typedef double f64;
 f64 NAN = 0e+0/0e+0;
 
 struct ReturnValue {
-  ${CValtype.f64} value;
-  ${CValtype.i32} type;
+  f64 value;
+  i32 type;
 };\n\n`;
 
 // todo: is memcpy/etc safe with host endianness?
@@ -41,60 +41,60 @@ const CMemFuncs = {
   [Opcodes.i32_store]: {
     c: `memcpy(_memory + offset + pointer, &value, sizeof(value));`,
     args: ['pointer', 'value'],
-    argTypes: [CValtype.i32, CValtype.i32],
+    argTypes: ['i32', 'i32'],
     returns: false
   },
   [Opcodes.i32_store16]: {
     c: `memcpy(_memory + offset + pointer, &value, sizeof(value));`,
     args: ['pointer', 'value'],
-    argTypes: [CValtype.i32, CValtype.i16],
+    argTypes: ['i32', 'i16'],
     returns: false
   },
   [Opcodes.i32_store8]: {
     c: `memcpy(_memory + offset + pointer, &value, sizeof(value));`,
     args: ['pointer', 'value'],
-    argTypes: [CValtype.i32, CValtype.i8],
+    argTypes: ['i32', 'i8'],
     returns: false
   },
 
   [Opcodes.i32_load]: {
-    c: `${CValtype.i32} out;
+    c: `i32 out;
 memcpy(&out, _memory + offset + pointer, sizeof(out));
 return out;`,
     args: ['pointer'],
-    argTypes: [CValtype.i32],
-    returns: CValtype.i32
+    argTypes: ['i32'],
+    returns: 'i32'
   },
   [Opcodes.i32_load16_u]: {
-    c: `${CValtype.i16} out;
+    c: `i16 out;
 memcpy(&out, _memory + offset + pointer, sizeof(out));
 return out;`,
     args: ['pointer'],
-    argTypes: [CValtype.i32],
-    returns: CValtype.i32
+    argTypes: ['i32'],
+    returns: 'i32'
   },
   [Opcodes.i32_load8_u]: {
-    c: `${CValtype.i8} out;
+    c: `i8 out;
 memcpy(&out, _memory + offset + pointer, sizeof(out));
 return out;`,
     args: ['pointer'],
-    argTypes: [CValtype.i32],
-    returns: CValtype.i32
+    argTypes: ['i32'],
+    returns: 'i32'
   },
 
   [Opcodes.f64_store]: {
     c: `memcpy(_memory + offset + pointer, &value, sizeof(value));`,
     args: ['pointer', 'value'],
-    argTypes: [CValtype.i32, CValtype.f64],
+    argTypes: ['i32', 'f64'],
     returns: false
   },
   [Opcodes.f64_load]: {
-    c: `${CValtype.f64} out;
+    c: `f64 out;
 memcpy(&out, _memory + offset + pointer, sizeof(out));
 return out;`,
     args: ['pointer'],
-    argTypes: [CValtype.i32],
-    returns: CValtype.f64
+    argTypes: ['i32'],
+    returns: 'f64'
   },
 };
 
@@ -108,7 +108,7 @@ for (const x in CValtype) {
 
 const removeBrackets = str => {
   // return str;
-  // if (str.startsWith(`(${CValtype.i32})(${CValtype.u32})`)) return `(${CValtype.i32})(${CValtype.u32})(` + removeBrackets(str.slice(22, -1)) + ')';
+  // if (str.startsWith('(i32)(u32)')) return '(i32)(u32)(' + removeBrackets(str.slice(22, -1)) + ')';
 
   for (const x in CValtype) {
     const p = `(${x})`;
@@ -156,7 +156,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
   }
 
   if (data.length > 0) {
-    prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n'));
+    prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n  '));
   }
 
   if (importFuncs.find(x => x.name === '__Porffor_readArgv')) {
@@ -168,10 +168,10 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   let depth = 1;
   let brDepth = 0;
-  const line = (str, semi = true) => out += `${' '.repeat(depth * 2 + brDepth * 2)}${str}${semi ? ';' : ''}\n`;
+  const line = (str, semi = true) => out += `${' '.repeat((depth + brDepth) * 2)}${str}${semi ? ';' : ''}\n`;
   const lines = lines => {
     for (const x of lines) {
-      out += `${' '.repeat(depth * 2)}${x}\n`;
+      out += `${' '.repeat((depth + brDepth) * 2)}${x}\n`;
     }
   };
 
@@ -219,10 +219,10 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
     const shouldInline = false; // f.internal;
     if (f.name === 'main') out += `int main(${prependMain.has('argv') ? 'int argc, char* argv[]' : ''}) {\n`;
-      else out += `${f.internal ? (returns ? CValtype.f64 : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
+      else out += `${f.internal ? (returns ? 'f64' : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
 
     if (f.name === 'main') {
-      out += [...prependMain.values()].join('\n');
+      out += '  ' + [...prependMain.values()].join('\n  ');
       if (prependMain.size > 0) out += '\n\n';
     }
 
@@ -283,12 +283,12 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
         switch (i[1]) {
           // i32_trunc_sat_f64_s
           case 0x02:
-            vals.push(`(${CValtype.i32})(${vals.pop()})`);
+            vals.push(`(i32)(${vals.pop()})`);
             break;
 
           // i32_trunc_sat_f64_u
           case 0x03:
-            vals.push(`(${CValtype.u32})(${vals.pop()})`);
+            vals.push(`(u32)(${vals.pop()})`);
             break;
         }
 
@@ -337,7 +337,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
         case Opcodes.f64_trunc:
           // vals.push(`trunc(${vals.pop()})`);
-          vals.push(`(${CValtype.i32})(${removeBrackets(vals.pop())})`); // this is ~10x faster with clang??
+          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster with clang??
           break;
 
         case Opcodes.f64_convert_i32_u:
@@ -345,7 +345,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
         case Opcodes.f64_convert_i64_u:
         case Opcodes.f64_convert_i64_s:
           // int to f64
-          vals.push(`(${CValtype.f64})(${removeBrackets(vals.pop())})`);
+          vals.push(`(f64)(${removeBrackets(vals.pop())})`);
           break;
 
         case Opcodes.i32_eqz:
@@ -353,7 +353,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
             vals.push(`!(${removeBrackets(vals.pop())})`);
           } else {
             let cond = '(' + removeBrackets(vals.pop());
-            if (cond.startsWith(`(${CValtype.i32})`)) cond = `${cond.slice(`(${CValtype.i32})`.length)}) == 0e+0`;
+            if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} == 0e+0`;
               else cond += ') == 0';
             vals.push(cond);
           }
@@ -368,7 +368,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
         case Opcodes.if: {
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
-            if (cond.startsWith(`(${CValtype.i32})`)) cond = `(${cond.slice(`(${CValtype.i32})`.length)}) != 0e+0`;
+            if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
               else cond = `(${cond}) != 0`;
           }
 
@@ -434,28 +434,16 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
             const importFunc = importFuncs[i[1]];
             switch (importFunc.name) {
               case 'print':
-                // line(`printf("%f\\n", ${vals.pop()})`);
                 line(`printf("${valtype === 'f64' ? '%g' : '%i'}\\n", ${vals.pop()})`);
                 includes.set('stdio.h', true);
                 break;
               case 'printChar':
-                line(`printf("%c", (int)(${vals.pop()}))`);
+                line(`putchar((int)(${vals.pop()}))`);
                 includes.set('stdio.h', true);
                 break;
 
               case 'time':
                 line(`double _time_out`);
-                /* platformSpecific(
-`FILETIME _time_filetime;
-GetSystemTimeAsFileTime(&_time_filetime);
-
-ULARGE_INTEGER _time_ularge;
-_time_ularge.LowPart = _time_filetime.dwLowDateTime;
-_time_ularge.HighPart = _time_filetime.dwHighDateTime;
-_time_out = (_time_ularge.QuadPart - 116444736000000000i64) / 10000.;`,
-`struct timespec _time;
-clock_gettime(CLOCK_MONOTONIC, &_time);
-_time_out = _time.tv_nsec / 1000000.;`); */
                 platformSpecific(
 `LARGE_INTEGER _time_freq, _time_t;
 QueryPerformanceFrequency(&_time_freq);
@@ -470,14 +458,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
                 winIncludes.set('windows.h', true);
                 break;
 
-              case '__Porffor_readArgv':
-                includes.set('stdlib.h', true);
-
+              case '__Porffor_readArgv': {
                 prepend.set('__Porffor_readArgv',
-`void __Porffor_readArgv(u32 index, u32 outPtr) {
+`i32 __Porffor_readArgv(u32 index, u32 outPtr) {
   if (index >= _argc) {
-    printf("expected %d arguments\\n", index);
-    exit(1);
+    return -1;
   }
 
   char* arg = _argv[index];
@@ -490,23 +475,24 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   }
 
   memcpy(_memory + outPtr, &read, sizeof(read));
+  return read;
 }`);
 
-                line(`__Porffor_readArgv((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
-                vals.pop();
+                const outPtr = vals.pop();
+                const index = vals.pop();
+                vals.push(`(f64)__Porffor_readArgv((u32)(${index}), (u32)(${outPtr}))`);
                 break;
+              }
 
-              case '__Porffor_readFile':
+              case '__Porffor_readFile': {
                 includes.set('stdio.h', true);
-                includes.set('stdlib.h', true);
 
                 prepend.set('__Porffor_readFile',
-`void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
+`i32 __Porffor_readFile(u32 pathPtr, u32 outPtr) {
   char* path = _memory + pathPtr + 4;
   FILE* fp = fopen(path, "r");
   if (fp == NULL) {
-    printf("failed to open file: %s\\n", path);
-    exit(1);
+    return -1;
   }
 
   u32 read = 0;
@@ -519,10 +505,13 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   fclose(fp);
 
   memcpy(_memory + outPtr, &read, sizeof(read));
+  return read;
 }`);
-                line(`__Porffor_readFile((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
-                vals.pop();
+                const outPtr = vals.pop();
+                const pathPtr = vals.pop();
+                vals.push(`(f64)__Porffor_readFile((u32)(${pathPtr}), (u32)(${outPtr}))`);
                 break;
+              }
 
               default:
                 log.warning('2c', `unimplemented import: ${importFunc.name}`);
@@ -539,9 +528,10 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             if (func.internal) {
               vals.push(`${sanitize(func.name)}(${args.join(', ')})`);
             } else {
-              line(`const struct ReturnValue _${retTmpId++} = ${sanitize(func.name)}(${args.join(', ')})`);
-              vals.push(`_.value`);
-              vals.push(`_.type`);
+              const id = retTmpId++;
+              line(`const struct ReturnValue _${id} = ${sanitize(func.name)}(${args.join(', ')})`);
+              vals.push(`_${id}.value`);
+              vals.push(`_${id}.type`);
             }
           } else line(`${sanitize(func.name)}(${args.join(', ')})`);
 
@@ -571,7 +561,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
-            if (cond.startsWith(`(${CValtype.i32})`)) cond = `(${cond.slice(`(${CValtype.i32})`.length)}) != 0e+0`;
+            if (cond.startsWith(`(i32)`)) cond = `${cond.slice(5)} != 0e+0`;
               else cond = `(${cond}) != 0`;
           }
 
@@ -601,8 +591,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             const name = invOpcodes[i[0]];
             const func = CMemFuncs[i[0]];
             if (!prepend.has(name)) {
-              prepend.set(name, `${func.returns || 'void'} ${name}(${CValtype.i32} align, ${CValtype.i32} offset, ${func.args.map((x, i) => `${func.argTypes[i]} ${x}`).join(', ')}) {\n  ${func.c.replaceAll('\n', '\n  ')}\n}\n`);
-              // generate func c and prepend
+              prepend.set(name, `${func.returns || 'void'} ${name}(i32 align, i32 offset, ${func.args.map((x, i) => `${func.argTypes[i]} ${x}`).join(', ')}) {\n  ${func.c.replaceAll('\n', '\n  ')}\n}\n`);
             }
 
             const immediates = [ i[1], read_unsignedLEB128(i.slice(2)) ];
@@ -637,7 +626,6 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   depth = 0;
 
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
-
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;
 
   return out.trim();

package/compiler/builtins/console.ts

@@ -1,4 +1,6 @@
-export const __console_clear = (): void => {
+import type {} from './porffor.d.ts';
+
+export const __console_clear = () => {
   const clear: bytestring = '\x1b[1;1H\x1b[J';
   Porffor.print(clear);
-};
+};

package/compiler/builtins/porffor.d.ts

@@ -22,6 +22,14 @@ type PorfforGlobal = {
     }
   }
 
+  allocate(): any;
+  set: {
+    read(_this: any, index: number): i32;
+    write(_this: any, index: number, value: any): boolean;
+  }
+
+  print(x: any): i32;
+
   randomByte(): i32;
 
   type(x: any): bytestring;
@@ -48,6 +56,9 @@ type PorfforGlobal = {
 
   s(...args: any): string;
   bs(...args: any): bytestring;
+
+  readArgv(index: i32, out: bytestring): i32;
+  readFile(path: bytestring, out: bytestring): i32;
 };
 
 declare global {

package/compiler/builtins/set.ts

@@ -189,9 +189,10 @@ export const Set$constructor = (iterable: any): Set => {
 
 export const __Set_prototype_union = (_this: Set, other: any) => {
   if (Porffor.rawType(other) != Porffor.TYPES.set) {
-    throw new TypeError("Set.union requires 'Set'");
+    throw new TypeError("Set.prototype.union\'s \'other\' argument must be a Set");
   }
-  const out: Set = new Set(_this);
+
+  const out: Set = Set$constructor(_this);
   for (const x of other) {
     out.add(x);
   }

package/compiler/builtins/symbol.ts

@@ -8,10 +8,10 @@ export const __Porffor_symbol_descStore = (op: boolean, value: any): any => {
     Porffor.wasm.i32.store(ptr, size + 1, 0, 0)
 
     // reuse set internals to store description
-    __Porffor_set_write(ptr, size, value);
+    Porffor.set.write(ptr, size, value);
     return size;
   } else { // read
-    return __Porffor_set_read(ptr, value);
+    return Porffor.set.read(ptr, value);
   }
 };
 
@@ -21,8 +21,8 @@ export const Symbol = (description: any): Symbol => {
 };
 
 export const __Symbol_prototype_description$get = (_this: Symbol) => {
-  const description: bytestring = __Porffor_symbol_descStore(false,
-    Porffor.wasm`local.get ${_this}` - 1);
+  const description: bytestring =
+    __Porffor_symbol_descStore(false, Porffor.wasm`local.get ${_this}` - 1);
   return description;
 };
 
@@ -38,8 +38,8 @@ export const __Symbol_prototype_toString = (_this: Symbol) => {
   Porffor.wasm.i32.store8(out, 108, 0, 9);
   Porffor.wasm.i32.store8(out, 40, 0, 10);
 
-  const description: bytestring = __Porffor_symbol_descStore(false,
-    Porffor.wasm`local.get ${_this}` - 1);
+  const description: bytestring =
+    __Porffor_symbol_descStore(false, Porffor.wasm`local.get ${_this}` - 1);
 
   const descLen: i32 = description.length;
   let outPtr: i32 = Porffor.wasm`local.get ${out}` + 7;

package/compiler/builtins.js

@@ -45,13 +45,13 @@ export const importedFuncs = [
     name: '__Porffor_readArgv',
     import: 'w',
     params: 2,
-    returns: 0
+    returns: 1
   },
   {
     name: '__Porffor_readFile',
     import: 'q',
     params: 2,
-    returns: 0
+    returns: 1
   }
 ];
 

package/compiler/codegen.js

@@ -2582,7 +2582,7 @@ const generateUnary = (scope, decl) => {
 
     case '!':
       const arg = decl.argument;
-      if (arg.type === "UnaryExpression" && arg.operator === "!") {
+      if (arg.type === 'UnaryExpression' && arg.operator === '!') {
         // !!x -> is x truthy
         return truthy(scope, generate(scope, arg.argument), getNodeType(scope, arg.argument), false, false);
       }

package/compiler/parse.js

@@ -10,7 +10,7 @@ if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
 const file = process.argv.slice(2).find(x => x[0] !== '-' && !['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(x));
 
 // should we try to support types (while parsing)
-const types = Prefs.parseTypes || file?.endsWith('.ts');
+const types = Prefs.parseTypes || Prefs.t || file?.endsWith('.ts');
 globalThis.typedInput = types && Prefs.optTypes;
 
 // todo: review which to use by default

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.16.0-c86dc1d57",
+  "version": "0.16.0-ec15a329e",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {