porffor 0.18.17 → 0.18.19

package/compiler/precompile.js

@@ -111,15 +111,12 @@ export const BuiltinFuncs = function() {
 ${funcs.map(x => {
   const wasm = JSON.stringify(x.wasm.filter(x => x.length && x[0] != null)).replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`).replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`).replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
   return `  this.${x.name} = {
-    wasm: (scope, {${wasm.includes('allocPage(') ? 'allocPage,' : ''}${wasm.includes('builtin(') ? 'builtin,' : ''}${wasm.includes('internalThrow(') ? 'internalThrow,' : ''}}) => ${wasm},
-    params: ${JSON.stringify(x.params)},
-    typedParams: true,
-    returns: ${JSON.stringify(x.returns)},
-    ${x.returnType != null ? `returnType: ${JSON.stringify(x.returnType)}` : 'typedReturns: true'},
-    locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))},
-    localNames: ${JSON.stringify(Object.keys(x.locals))},
-${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
-${x.table ? `    table: true,` : ''}${x.constr ? `    constr: true,` : ''}${x.hasRestArgument ? `    hasRestArgument: true,` : ''}
+    wasm: (scope, {${`${wasm.includes('allocPage(') ? 'allocPage,' : ''}${wasm.includes('builtin(') ? 'builtin,' : ''}${wasm.includes('internalThrow(') ? 'internalThrow,' : ''}`.slice(0, -1)}}) => ${wasm},
+    params: ${JSON.stringify(x.params)}, typedParams: 1,
+    returns: ${JSON.stringify(x.returns)}, ${x.returnType != null ? `returnType: ${JSON.stringify(x.returnType)}` : 'typedReturns: 1'},
+    locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))}, localNames: ${JSON.stringify(Object.keys(x.locals))},
+${x.data && x.data.length > 0 ? `    data: [${x.data.map(x => `[${x.offset ?? 'null'},[${x.bytes.join(',')}]]`).join(',')}],` : ''}
+${x.table ? `    table: 1,` : ''}${x.constr ? `    constr: 1,` : ''}${x.hasRestArgument ? `    hasRestArgument: 1,` : ''}
   };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
 }).join('\n')}
 };`;

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.18.17+4d4df7afe",
+  "version": "0.18.19+cf63905b0",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.18.17+4d4df7afe';
+globalThis.version = '0.18.19+cf63905b0';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/compiler/builtins/int.ts

@@ -1,147 +0,0 @@
-import type {} from './porffor.d.ts';
-
-// radix: number|any for rawType check
-// export const parseInt = (input: string|bytestring, radix: number|any): f64 => {
-export const parseInt = (input: string|bytestring, radix: number): f64 => {
-  // todo/perf: optimize this instead of doing a naive algo (https://kholdstare.github.io/technical/2020/05/26/faster-integer-parsing.html)
-  // todo/perf: use i32s here once that becomes not annoying
-
-  if (Porffor.rawType(radix) != Porffor.TYPES.number) {
-    // todo: string to number
-    radix = 10;
-  }
-
-  if (radix == 0) radix = 10;
-  if (radix < 2 || radix > 36) return NaN;
-
-  let nMax: f64 = 58;
-  if (radix < 10) nMax = 48 + radix;
-
-  // if (Porffor.rawType(input) == Porffor.TYPES.bytestring) input = __ByteString_prototype_trimStart(input);
-  //   else input = __String_prototype_trimStart(input);
-
-  let n: f64 = NaN;
-
-  const inputPtr: f64 = Porffor.wasm`local.get ${input}`;
-  const len: f64 = Porffor.wasm.i32.load(inputPtr, 0, 0);
-  let i: f64 = inputPtr;
-
-  let negative: boolean = false;
-
-  if (Porffor.rawType(input) == Porffor.TYPES.bytestring) {
-    const endPtr: f64 = i + len;
-
-    // check start of string
-    const startChr: f64 = Porffor.wasm.i32.load8_u(i, 0, 4);
-
-    // +, ignore
-    if (startChr == 43) i++;
-
-    // -, switch to negative
-    if (startChr == 45) {
-      negative = true;
-      i++;
-    }
-
-    // 0, potential start of hex
-    if (startChr == 48) {
-      const second: f64 = Porffor.wasm.i32.load8_u(i + 1, 0, 4);
-      // 0x or 0X
-      if (second == 120 || second == 88) {
-        // set radix to 16 and skip leading 2 chars
-        i += 2;
-        radix = 16;
-      }
-    }
-
-    while (i < endPtr) {
-      const chr: f64 = Porffor.wasm.i32.load8_u(i++, 0, 4);
-
-      if (chr >= 48 && chr < nMax) {
-        if (Number.isNaN(n)) n = 0;
-
-        n *= radix;
-        n += chr - 48;
-      } else if (radix > 10) {
-        if (chr >= 97 && chr < (87 + radix)) {
-          if (Number.isNaN(n)) n = 0;
-
-          n *= radix;
-          n += chr - 87;
-        } else if (chr >= 65 && chr < (55 + radix)) {
-          if (Number.isNaN(n)) n = 0;
-
-          n *= radix;
-          n += chr - 55;
-        } else {
-          if (negative) return -n;
-          return n;
-        }
-      } else {
-        if (negative) return -n;
-        return n;
-      }
-    }
-
-    if (negative) return -n;
-    return n;
-  }
-
-  const endPtr: f64 = i + len * 2;
-
-  // check start of string
-  const startChr: f64 = Porffor.wasm.i32.load16_u(i, 0, 4);
-
-  // +, ignore
-  if (startChr == 43) i += 2;
-
-  // -, switch to negative
-  if (startChr == 45) {
-    negative = true;
-    i += 2;
-  }
-
-  // 0, potential start of hex
-  if (startChr == 48) {
-    const second: f64 = Porffor.wasm.i32.load16_u(i + 2, 0, 4);
-    // 0x or 0X
-    if (second == 120 || second == 88) {
-      // set radix to 16 and skip leading 2 chars
-      i += 4;
-      radix = 16;
-    }
-  }
-
-  while (i < endPtr) {
-    const chr: f64 = Porffor.wasm.i32.load16_u(i, 0, 4);
-    i += 2;
-
-    if (chr >= 48 && chr < nMax) {
-      if (Number.isNaN(n)) n = 0;
-
-      n *= radix;
-      n += chr - 48;
-    } else if (radix > 10) {
-      if (chr >= 97 && chr < (87 + radix)) {
-        if (Number.isNaN(n)) n = 0;
-
-        n *= radix;
-        n += chr - 87;
-      } else if (chr >= 65 && chr < (55 + radix)) {
-        if (Number.isNaN(n)) n = 0;
-
-        n *= radix;
-        n += chr - 55;
-      } else {
-        if (negative) return -n;
-        return n;
-      }
-    } else {
-      if (negative) return -n;
-      return n;
-    }
-  }
-
-  if (negative) return -n;
-  return n;
-};