porffor 0.16.0-c6061294e → 0.16.0-c86dc1d57

package/CONTRIBUTING.md

@@ -206,7 +206,6 @@ 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>
 
@@ -233,7 +232,7 @@ builtins/tostring_number: impl radix
 
 ## Test262
 
-For the first time, ensure you run `./test262/setup.sh`.
+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.
 
 Run `node test262` to run all the tests and get an output of total overall test results.
 
@@ -247,7 +246,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 want 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 can 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

@@ -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 + brDepth) * 2)}${str}${semi ? ';' : ''}\n`;
+  const line = (str, semi = true) => out += `${' '.repeat(depth * 2 + brDepth * 2)}${str}${semi ? ';' : ''}\n`;
   const lines = lines => {
     for (const x of lines) {
-      out += `${' '.repeat((depth + brDepth) * 2)}${x}\n`;
+      out += `${' '.repeat(depth * 2)}${x}\n`;
     }
   };
 
@@ -222,7 +222,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
       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`;
 
     if (f.name === 'main') {
-      out += '  ' + [...prependMain.values()].join('\n  ');
+      out += [...prependMain.values()].join('\n');
       if (prependMain.size > 0) out += '\n\n';
     }
 
@@ -439,7 +439,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
                 includes.set('stdio.h', true);
                 break;
               case 'printChar':
-                line(`putchar((int)(${vals.pop()}))`);
+                line(`printf("%c", (int)(${vals.pop()}))`);
                 includes.set('stdio.h', true);
                 break;
 
@@ -470,11 +470,14 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
                 winIncludes.set('windows.h', true);
                 break;
 
-              case '__Porffor_readArgv': {
+              case '__Porffor_readArgv':
+                includes.set('stdlib.h', true);
+
                 prepend.set('__Porffor_readArgv',
-`i32 __Porffor_readArgv(u32 index, u32 outPtr) {
+`void __Porffor_readArgv(u32 index, u32 outPtr) {
   if (index >= _argc) {
-    return -1;
+    printf("expected %d arguments\\n", index);
+    exit(1);
   }
 
   char* arg = _argv[index];
@@ -487,24 +490,23 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   }
 
   memcpy(_memory + outPtr, &read, sizeof(read));
-  return read;
 }`);
 
-                const outPtr = vals.pop();
-                const index = vals.pop();
-                vals.push(`(f64)__Porffor_readArgv((u32)(${index}), (u32)(${outPtr}))`);
+                line(`__Porffor_readArgv((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
+                vals.pop();
                 break;
-              }
 
-              case '__Porffor_readFile': {
+              case '__Porffor_readFile':
                 includes.set('stdio.h', true);
+                includes.set('stdlib.h', true);
 
                 prepend.set('__Porffor_readFile',
-`i32 __Porffor_readFile(u32 pathPtr, u32 outPtr) {
+`void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
   char* path = _memory + pathPtr + 4;
   FILE* fp = fopen(path, "r");
   if (fp == NULL) {
-    return -1;
+    printf("failed to open file: %s\\n", path);
+    exit(1);
   }
 
   u32 read = 0;
@@ -517,13 +519,10 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   fclose(fp);
 
   memcpy(_memory + outPtr, &read, sizeof(read));
-  return read;
 }`);
-                const outPtr = vals.pop();
-                const pathPtr = vals.pop();
-                vals.push(`(f64)__Porffor_readFile((u32)(${pathPtr}), (u32)(${outPtr}))`);
+                line(`__Porffor_readFile((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
+                vals.pop();
                 break;
-              }
 
               default:
                 log.warning('2c', `unimplemented import: ${importFunc.name}`);
@@ -540,10 +539,9 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             if (func.internal) {
               vals.push(`${sanitize(func.name)}(${args.join(', ')})`);
             } else {
-              const id = retTmpId++;
-              line(`const struct ReturnValue _${id} = ${sanitize(func.name)}(${args.join(', ')})`);
-              vals.push(`_${id}.value`);
-              vals.push(`_${id}.type`);
+              line(`const struct ReturnValue _${retTmpId++} = ${sanitize(func.name)}(${args.join(', ')})`);
+              vals.push(`_.value`);
+              vals.push(`_.type`);
             }
           } else line(`${sanitize(func.name)}(${args.join(', ')})`);
 

package/compiler/builtins/console.ts

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

package/compiler/builtins/porffor.d.ts

@@ -22,14 +22,6 @@ 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;
@@ -56,9 +48,6 @@ 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,10 +189,9 @@ 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.prototype.union\'s \'other\' argument must be a Set");
+    throw new TypeError("Set.union requires 'Set'");
   }
-
-  const out: Set = Set$constructor(_this);
+  const out: Set = new Set(_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: 1
+    returns: 0
   },
   {
     name: '__Porffor_readFile',
     import: 'q',
     params: 2,
-    returns: 1
+    returns: 0
   }
 ];
 

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 || Prefs.t || file?.endsWith('.ts');
+const types = Prefs.parseTypes || 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-c6061294e",
+  "version": "0.16.0-c86dc1d57",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {