porffor 0.2.0-67434d5 → 0.2.0-6922552

package/compiler/parse.js

@@ -9,8 +9,10 @@ if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
   globalThis.process = { argv: ['', '', ...Deno.args], stdout: { write: str => Deno.writeAllSync(Deno.stdout, textEncoder.encode(str)) } };
 }
 
+const file = process.argv.slice(2).find(x => x[0] !== '-');
+
 // should we try to support types (while parsing)
-const types = Prefs.parseTypes;
+const types = Prefs.parseTypes || file?.endsWith('.ts');
 globalThis.typedInput = types && Prefs.optTypes;
 
 // todo: review which to use by default

package/compiler/precompile.js

@@ -70,7 +70,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
       if (y[0] === Opcodes.const && (n[0] === Opcodes.local_set || n[0] === Opcodes.local_tee)) {
         const l = locals[n[1]];
         if (!l) continue;
-        if (![TYPES.string, TYPES._array, TYPES._bytestring].includes(l.metadata?.type)) continue;
+        if (![TYPES.string, TYPES.array, TYPES.bytestring].includes(l.metadata?.type)) continue;
         if (!x.pages) continue;
 
         const pageName = [...x.pages.keys()].find(z => z.endsWith(l.name));
@@ -93,9 +93,14 @@ const precompile = async () => {
   let funcs = [], globals = [];
   for (const file of fs.readdirSync(dir)) {
     if (file.endsWith('.d.ts')) continue;
+    console.log(file);
+
     await compile(join(dir, file), [ funcs, globals ]);
   }
 
+  // const a = funcs.find(x => x.name === '__ecma262_ToUTCDTSF');
+  // console.log(Object.values(a.locals).slice(a.params.length));
+
   // ${x.pages && x.pages.size > 0 ? `    pages: ${JSON.stringify(Object.fromEntries(x.pages.entries()))},` : ''}
   // ${x.used && x.used.length > 0 ? `    used: ${JSON.stringify(x.used)},` : ''}
 

package/compiler/prefs.js

@@ -1,4 +1,4 @@
-const onByDefault = [ 'bytestring', 'aotPointerOpt', 'treeshakeWasmImports' ];
+const onByDefault = [ 'bytestring', 'aotPointerOpt', 'treeshakeWasmImports', 'alwaysMemory' ];
 
 let cache = {};
 const obj = new Proxy({}, {

package/compiler/prototype.js

@@ -14,7 +14,7 @@ export const PrototypeFuncs = function() {
   if (Prefs.zeroChecks) zeroChecks = Prefs.zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
     else zeroChecks = {};
 
-  this[TYPES._array] = {
+  this[TYPES.array] = {
     // lX = local accessor of X ({ get, set }), iX = local index of X, wX = wasm ops of X
     at: (pointer, length, wIndex, iTmp) => [
       ...wIndex,
@@ -253,10 +253,10 @@ export const PrototypeFuncs = function() {
     ]
   };
 
-  this[TYPES._array].at.local = Valtype.i32;
-  this[TYPES._array].push.noArgRetLength = true;
-  this[TYPES._array].fill.local = valtypeBinary;
-  this[TYPES._array].fill.returnType = TYPES._array;
+  this[TYPES.array].at.local = Valtype.i32;
+  this[TYPES.array].push.noArgRetLength = true;
+  this[TYPES.array].fill.local = valtypeBinary;
+  this[TYPES.array].fill.returnType = TYPES.array;
 
   this[TYPES.string] = {
     at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
@@ -476,7 +476,7 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
 
   if (Prefs.bytestring) {
-    this[TYPES._bytestring] = {
+    this[TYPES.bytestring] = {
       at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
         const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
@@ -606,14 +606,14 @@ export const PrototypeFuncs = function() {
       }
     };
 
-    this[TYPES._bytestring].at.local = Valtype.i32;
-    this[TYPES._bytestring].at.returnType = TYPES._bytestring;
-    this[TYPES._bytestring].charAt.returnType = TYPES._bytestring;
-    this[TYPES._bytestring].charCodeAt.local = Valtype.i32;
-    this[TYPES._bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
+    this[TYPES.bytestring].at.local = Valtype.i32;
+    this[TYPES.bytestring].at.returnType = TYPES.bytestring;
+    this[TYPES.bytestring].charAt.returnType = TYPES.bytestring;
+    this[TYPES.bytestring].charCodeAt.local = Valtype.i32;
+    this[TYPES.bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
 
-    this[TYPES._bytestring].isWellFormed.local = Valtype.i32;
-    this[TYPES._bytestring].isWellFormed.local2 = Valtype.i32;
-    this[TYPES._bytestring].isWellFormed.returnType = TYPES.boolean;
+    this[TYPES.bytestring].isWellFormed.local = Valtype.i32;
+    this[TYPES.bytestring].isWellFormed.local2 = Valtype.i32;
+    this[TYPES.bytestring].isWellFormed.returnType = TYPES.boolean;
   }
 };

package/compiler/types.js

@@ -24,7 +24,7 @@ export const INTERNAL_TYPE_BASE = 0x10;
 let internalTypeIndex = INTERNAL_TYPE_BASE;
 const registerInternalType = name => {
   const n = internalTypeIndex++;
-  TYPES['_' + name.toLowerCase()] = n;
+  TYPES[name.toLowerCase()] = n;
   TYPE_NAMES[n] = name;
 };
 

package/compiler/wrap.js

@@ -178,7 +178,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
             return {[func.name]() {}}[func.name];
           }
 
-          case TYPES._array: {
+          case TYPES.array: {
             const pointer = ret;
             const length = (new Int32Array(memory.buffer, pointer, 1))[0];
 
@@ -188,14 +188,14 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
             return Array.from(new Float64Array(buf));
           }
 
-          case TYPES._bytestring: {
+          case TYPES.bytestring: {
             const pointer = ret;
             const length = (new Int32Array(memory.buffer, pointer, 1))[0];
 
             return Array.from(new Uint8Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
           }
 
-          case TYPES._date: {
+          case TYPES.date: {
             const pointer = ret;
             const value = (new Float64Array(memory.buffer, pointer, 1))[0];
 

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-67434d5",
+  "version": "0.2.0-6922552",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {

package/runner/index.js

@@ -38,19 +38,21 @@ if (process.argv.includes('--help')) {
     console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
   }
 
-    // options
-    console.log(`\n\u001b[4mCommands\x1B[0m`);
-    for (const [ cmd, [ color, desc ] ] of Object.entries({
-      run: [ 34, 'Run a JS file' ],
-      wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
-      c: [ 31, 'Compile a JS file to C source code' ],
-      native: [ 31, 'Compile a JS file to a native binary\n' ],
-      profile: [ 33, 'Profile a JS file' ],
-      debug: [ 33, 'Debug a JS file' ],
-      'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
-    })) {
-      console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
-    }
+  // console.log();
+
+  // // options
+  // console.log(`\n\u001b[4mCommands\x1B[0m`);
+  // for (const [ cmd, [ color, desc ] ] of Object.entries({
+  //   run: [ 34, 'Run a JS file' ],
+  //   wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
+  //   c: [ 31, 'Compile a JS file to C source code' ],
+  //   native: [ 31, 'Compile a JS file to a native binary\n' ],
+  //   profile: [ 33, 'Profile a JS file' ],
+  //   debug: [ 33, 'Debug a JS file' ],
+  //   'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
+  // })) {
+  //   console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
+  // }
 
   console.log();
   process.exit(0);

package/fib.js

@@ -1,10 +0,0 @@
-const fib = n => {
-  if (n < 2) {
-    return n;
-  } else {
-    return fib(n - 1) + fib(n - 2);
-  }
-};
-
-console.log(fib(7));
-