porffor 0.16.0-fe07da0f4 → 0.17.0-05070e1f0

package/compiler/assemble.js

@@ -21,7 +21,7 @@ const chHint = (topTier, baselineTier, strategy) => {
   return (strategy | (baselineTier << 2) | (topTier << 4));
 };
 
-export default (funcs, globals, tags, pages, data, flags) => {
+export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) => {
   const types = [], typeCache = {};
 
   const optLevel = parseInt(process.argv.find(x => x.startsWith('-O'))?.[2] ?? 1);
@@ -44,7 +44,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   let importFuncs = [];
 
-  if (optLevel < 1 || !Prefs.treeshakeWasmImports) {
+  if (optLevel < 1 || !Prefs.treeshakeWasmImports || noTreeshake) {
     importFuncs = importedFuncs;
   } else {
     let imports = new Map();
@@ -94,7 +94,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const importSection = importFuncs.length === 0 ? [] : createSection(
     Section.import,
-    encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(new Array(x.params).fill(x.name.startsWith('profile') ? Valtype.i32 : valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
+    encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(typeof x.params === 'object' ? x.params : new Array(x.params).fill(valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
   );
 
   const funcSection = createSection(
@@ -116,7 +116,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     ] ])
   );
 
-  if (pages.has('func argc lut')) {
+  if (pages.has('func argc lut') && !data.addedFuncArgcLut) {
     // generate func argc lut data
     const bytes = [];
     for (let i = 0; i < funcs.length; i++) {
@@ -128,6 +128,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
       offset: pages.get('func argc lut').ind * pageSize,
       bytes
     });
+    data.addedFuncArgcLut = true;
   }
 
   // const t0 = performance.now();
@@ -239,7 +240,13 @@ export default (funcs, globals, tags, pages, data, flags) => {
 
   const dataSection = data.length === 0 ? [] : createSection(
     Section.data,
-    encodeVector(data.map(x => [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ]))
+    encodeVector(data.map(x => {
+      // type: active
+      if (x.offset != null) return [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ];
+
+      // type: passive
+      return [ 0x01, ...encodeVector(x.bytes) ];
+    }))
   );
 
   const dataCountSection = data.length === 0 ? [] : createSection(

package/compiler/builtins/array.ts

@@ -54,7 +54,7 @@ export const __Array_prototype_indexOf = (_this: any[], searchElement: any, posi
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -68,7 +68,7 @@ export const __Array_prototype_lastIndexOf = (_this: any[], searchElement: any,
   } else position = 0;
 
   for (let i: i32 = len - 1; i >= position; i--) {
-    if (_this[i] == searchElement) return i;
+    if (_this[i] === searchElement) return i;
   }
 
   return -1;
@@ -82,7 +82,7 @@ export const __Array_prototype_includes = (_this: any[], searchElement: any, pos
   } else position = 0;
 
   for (let i: i32 = position; i < len; i++) {
-    if (_this[i] == searchElement) return true;
+    if (_this[i] === searchElement) return true;
   }
 
   return false;
@@ -171,12 +171,13 @@ export const __Array_prototype_filter = (_this: any[], callbackFn: any) => {
 };
 
 export const __Array_prototype_map = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
   const out: any[] = [];
+  out.length = len;
 
-  const len: i32 = _this.length;
   let i: i32 = 0;
   while (i < len) {
-    out.push(callbackFn(_this[i], i++, _this));
+    out[i] = callbackFn(_this[i], i++, _this);
   }
 
   return out;
@@ -222,4 +223,92 @@ export const __Array_prototype_every = (_this: any[], callbackFn: any) => {
   }
 
   return true;
+};
+
+export const __Array_prototype_some = (_this: any[], callbackFn: any) => {
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (Boolean(callbackFn(_this[i], i++, _this))) return true;
+  }
+
+  return false;
+};
+
+export const __Array_prototype_reduce = (_this: any[], callbackFn: any, initialValue: any) => {
+  let acc: any = initialValue ?? _this[0];
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    acc = callbackFn(acc, _this[i], i++, _this);
+  }
+
+  return acc;
+};
+
+export const __Array_prototype_reduceRight = (_this: any[], callbackFn: any, initialValue: any) => {
+  const len: i32 = _this.length;
+  let acc: any = initialValue ?? _this[len - 1];
+
+  let i: i32 = len;
+  while (i > 0) {
+    acc = callbackFn(acc, _this[--i], i, _this);
+  }
+
+  return acc;
+};
+
+export const __Array_prototype_toString = (_this: any[]) => {
+  // todo: this is bytestring only!
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendChar(out, 44);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
+};
+
+export const __Array_prototype_join = (_this: any[], _separator: any) => {
+  // todo: this is bytestring only!
+  // todo/perf: optimize single char separators
+  // todo/perf: optimize default separator (?)
+
+  let separator: bytestring = ',';
+  if (Porffor.rawType(_separator) != Porffor.TYPES.undefined)
+    separator = ecma262.ToString(_separator);
+
+  let out: bytestring = '';
+  out.length = 0;
+
+  const len: i32 = _this.length;
+  let i: i32 = 0;
+  while (i < len) {
+    if (i > 0) Porffor.bytestring.appendStr(out, separator);
+
+    const element: any = _this[i++];
+    const type: i32 = Porffor.rawType(element);
+    if (element != 0 || Porffor.fastAnd(
+      type != Porffor.TYPES.undefined, // undefined
+      type != Porffor.TYPES.object // null
+    )) {
+      Porffor.bytestring.appendStr(out, ecma262.ToString(element));
+    }
+  }
+
+  return out;
 };

package/compiler/builtins/base64.ts

@@ -2,17 +2,18 @@
 import type {} from './porffor.d.ts';
 
 export const btoa = (input: bytestring): bytestring => {
+  // todo: throw on invalid chars
+
   const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
   const keyStrPtr: i32 = Porffor.wasm`local.get ${keyStr}`;
 
   let len: i32 = input.length;
   let output: bytestring = '';
-  output.length = 4 * (len / 3 + !!(len % 3));
 
   let i: i32 = Porffor.wasm`local.get ${input}`,
       j: i32 = Porffor.wasm`local.get ${output}`;
 
-  // todo/perf: add some per 6 char variant using bitwise magic
+  // todo/perf: add some per 6 char variant using bitwise magic?
 
   const endPtr = i + len;
   while (i < endPtr) {
@@ -38,40 +39,43 @@ export const btoa = (input: bytestring): bytestring => {
     Porffor.wasm.i32.store8(j++, Porffor.wasm.i32.load8_u(keyStrPtr + enc4, 0, 4), 0, 4);
   }
 
+  output.length = j - Porffor.wasm`local.get ${output}`;
   return output;
 };
 
-// todo: impl atob by converting below to "porf ts"
-/* var atob = function (input) {
-  const keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+export const atob = (input: bytestring): bytestring => {
+  // todo: throw on non-base64 chars
+
+  const lut: bytestring = '@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@>@@@?456789:;<=@@@@@@@\x00\x01\x02\x03\x04\x05\x06\x07\b\t\n\x0B\f\r\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19@@@@@@\x1A\x1B\x1C\x1D\x1E\x1F !"#$%&\'()*+,-./0123';
+  const lutPtr: i32 = Porffor.wasm`local.get ${lut}`;
+
+  let output: bytestring = '';
 
-  let output = "";
-  let chr1, chr2, chr3;
-  let enc1, enc2, enc3, enc4;
-  let i = 0;
+  let i: i32 = Porffor.wasm`local.get ${input}`,
+      j: i32 = Porffor.wasm`local.get ${output}`;
 
-  while (i < input.length) {
-    enc1 = keyStr.indexOf(input.charAt(i++));
-    enc2 = keyStr.indexOf(input.charAt(i++));
-    enc3 = keyStr.indexOf(input.charAt(i++));
-    enc4 = keyStr.indexOf(input.charAt(i++));
+  const endPtr = i + input.length;
+  while (i < endPtr) {
+    const enc1: i32 = Porffor.wasm.i32.load8_u(lutPtr + Porffor.wasm.i32.load8_u(i++, 0, 4), 0, 4);
+    const enc2: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(lutPtr + Porffor.wasm.i32.load8_u(i++, 0, 4), 0, 4) : -1;
+    const enc3: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(lutPtr + Porffor.wasm.i32.load8_u(i++, 0, 4), 0, 4) : -1;
+    const enc4: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(lutPtr + Porffor.wasm.i32.load8_u(i++, 0, 4), 0, 4) : -1;
 
-    chr1 = (enc1 << 2) | (enc2 >> 4);
-    chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-    chr3 = ((enc3 & 3) << 6) | enc4;
+    const chr1: i32 = (enc1 << 2) | (enc2 == -1 ? 0 : (enc2 >> 4));
+    const chr2: i32 = ((enc2 & 15) << 4) | (enc3 == -1 ? 0 : (enc3 >> 2));
+    const chr3: i32 = ((enc3 & 3) << 6) | (enc4 == -1 ? 0 : enc4);
 
-    // output += String.fromCharCode(chr1);
-    Porffor.bytestring.appendCharCode(output, chr1);
+    Porffor.wasm.i32.store8(j++, chr1, 0, 4);
 
     if (enc3 != 64) {
-      // output += String.fromCharCode(chr2);
-      Porffor.bytestring.appendCharCode(output, chr2);
+      Porffor.wasm.i32.store8(j++, chr2, 0, 4);
     }
+
     if (enc4 != 64) {
-      // output += String.fromCharCode(chr3);
-      Porffor.bytestring.appendCharCode(output, chr3);
+      Porffor.wasm.i32.store8(j++, chr3, 0, 4);
     }
   }
 
+  output.length = j - Porffor.wasm`local.get ${output}`;
   return output;
-}; */
+};

package/compiler/builtins/date.ts

@@ -253,29 +253,6 @@ export const __ecma262_UTC = (t: number): number => {
   return t;
 };
 
-
-// todo: move this somewhere generic?
-// 7.1.5 ToIntegerOrInfinity (argument)
-// https://tc39.es/ecma262/multipage/abstract-operations.html#sec-tointegerorinfinity
-export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
-  // 1. Let number be ? ToNumber(argument).
-  let number: number = Number(argument);
-
-  // 2. If number is one of NaN, +0𝔽, or -0𝔽, return 0.
-  if (Number.isNaN(number)) return 0;
-
-  // 3. If number is +∞𝔽, return +∞.
-  // 4. If number is -∞𝔽, return -∞.
-  if (!Number.isFinite(number)) return number;
-
-  // 5. Return truncate(ℝ(number)).
-  number = Math.trunc(number);
-
-  // return 0 for -0
-  if (number == 0) return 0;
-  return number;
-};
-
 // 21.4.1.27 MakeTime (hour, min, sec, ms)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-maketime
 export const __ecma262_MakeTime = (hour: number, min: number, sec: number, ms: number): number => {
@@ -722,12 +699,9 @@ export const __Porffor_date_allocate = (): Date => {
   const hack: bytestring = '';
 
   if (hack.length == 0) {
-    hack.length = Porffor.wasm`i32.const 1
-memory.grow 0
-drop
-memory.size 0
+    hack.length = Porffor.wasm`
 i32.const 1
-i32.sub
+memory.grow 0
 i32.const 65536
 i32.mul
 i32.from_u`;
@@ -1894,8 +1868,7 @@ export const __ecma262_ToDateString = (tv: number) => {
 
   // 1. If tv is NaN, return "Invalid Date".
   if (Number.isNaN(tv)) {
-    out = 'Invalid Date';
-    return out;
+    return out = 'Invalid Date';
   }
 
   // 2. Let t be LocalTime(tv).

package/compiler/builtins/math.ts

@@ -16,7 +16,7 @@ export const __Math_exp = (x: number): number => {
     return 1 / Math.exp(-x);
   }
 
-  const k: number = Math.floor(x / Math.LN2);
+  let k: number = Math.floor(x / Math.LN2);
   const r: number = x - k * Math.LN2;
 
   // Taylor series via Horner's method
@@ -30,7 +30,11 @@ export const __Math_exp = (x: number): number => {
     i++;
   }
 
-  return sum * (1 << k);
+  while (k-- > 0) {
+    sum *= 2;
+  }
+
+  return sum;
 };
 
 export const __Math_log2 = (y: number): number => {

package/compiler/builtins/number.ts

@@ -6,11 +6,9 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   if (Porffor.rawType(radix) != Porffor.TYPES.number) {
@@ -24,8 +22,7 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   }
 
   if (_this == 0) {
-    out = '0';
-    return out;
+    return out = '0';
   }
 
   // if negative value
@@ -99,7 +96,6 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
       }
 
       out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
       return out;
     }
 
@@ -235,7 +231,6 @@ export const __Number_prototype_toString = (_this: number, radix: number|any) =>
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 
@@ -244,11 +239,9 @@ export const __Number_prototype_toFixed = (_this: number, fractionDigits: number
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   fractionDigits |= 0;
@@ -324,7 +317,6 @@ export const __Number_prototype_toFixed = (_this: number, fractionDigits: number
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 
@@ -334,11 +326,9 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
   let outPtr: i32 = Porffor.wasm`local.get ${out}`;
 
   if (!Number.isFinite(_this)) {
-    if (Number.isNaN(_this)) out = 'NaN';
-      else if (_this == Infinity) out = 'Infinity';
-      else out = '-Infinity';
-
-    return out;
+    if (Number.isNaN(_this)) return out = 'NaN';
+    if (_this == Infinity) return out = 'Infinity';
+    return out = '-Infinity';
   }
 
   if (Porffor.rawType(fractionDigits) != Porffor.TYPES.number) {
@@ -519,7 +509,6 @@ export const __Number_prototype_toExponential = (_this: number, fractionDigits:
   }
 
   out.length = outPtr - Porffor.wasm`local.get ${out}`;
-
   return out;
 };
 

package/compiler/builtins/porffor.d.ts

@@ -28,6 +28,13 @@ type PorfforGlobal = {
     write(_this: any, index: number, value: any): boolean;
   }
 
+  bytestring: {
+    // defined in date.ts
+    appendStr(str: bytestring, appendage: bytestring): i32;
+    appendChar(str: bytestring, char: i32): i32;
+    appendPadNum(str: bytestring, num: number, len: number): i32;
+  }
+
   print(x: any): i32;
 
   randomByte(): i32;
@@ -56,6 +63,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

@@ -2,12 +2,9 @@ import type {} from './porffor.d.ts';
 
 // dark wasm magic for dealing with memory, sorry.
 export const __Porffor_allocate = (): number => {
-  Porffor.wasm`i32.const 1
-memory.grow 0
-drop
-memory.size 0
+  Porffor.wasm`
 i32.const 1
-i32.sub
+memory.grow 0
 i32.const 65536
 i32.mul
 i32.from_u
@@ -173,15 +170,8 @@ export const Set = () => {
 export const Set$constructor = (iterable: any): Set => {
   const out: Set = __Porffor_allocate();
 
-  const type: number = Porffor.rawType(iterable);
-  if (Porffor.fastOr(
-    type == Porffor.TYPES.array,
-    type == Porffor.TYPES.string, type == Porffor.TYPES.bytestring,
-    type == Porffor.TYPES.set
-  )) {
-    for (const x of iterable) {
-      __Set_prototype_add(out, x);
-    }
+  if (Porffor.rawType(iterable) != Porffor.TYPES.undefined) for (const x of iterable) {
+    __Set_prototype_add(out, x);
   }
 
   return out;
@@ -198,3 +188,8 @@ export const __Set_prototype_union = (_this: Set, other: any) => {
   }
   return out;
 };
+
+export const __Set_prototype_toString = (_this: Set) => {
+  const out: bytestring = '[object Set]';
+  return out;
+};

package/compiler/builtins/string_f64.ts

@@ -0,0 +1,10 @@
+// todo: support non-bytestring properly
+export const String = (value: any): bytestring => {
+  if (Porffor.rawType(value) == Porffor.TYPES.symbol) return __Symbol_prototype_toString(value);
+  return __ecma262_ToString(value);
+};
+
+// todo: support constructor/string objects properly
+export const String$constructor = (value: any): bytestring => {
+  return __ecma262_ToString(value);
+};

package/compiler/builtins/typedarray.js

@@ -0,0 +1,42 @@
+export default () => {
+  let out = '';
+
+  const constr = name => out += `export const ${name} = () => {
+  throw new TypeError("Constructor ${name} requires 'new'");
+};
+
+export const ${name}$constructor = (arg: any): ${name} => {
+  const out: ${name} = Porffor.allocate();
+  let len: i32 = 0;
+
+  const type: i32 = Porffor.rawType(arg);
+  if (Porffor.fastOr(
+    type == Porffor.TYPES.array,
+    type == Porffor.TYPES.string, type == Porffor.TYPES.bytestring,
+    type == Porffor.TYPES.set
+  )) {
+    let i: i32 = 0;
+    for (const x of arg) {
+      out[i++] = x;
+    }
+    len = i;
+  } else if (type == Porffor.TYPES.number) {
+    len = arg;
+  }
+
+  out.length = len;
+  return out;
+};`;
+
+  constr('Uint8Array');
+  constr('Int8Array');
+  constr('Uint8ClampedArray');
+  constr('Uint16Array');
+  constr('Int16Array');
+  constr('Uint32Array');
+  constr('Int32Array');
+  constr('Float32Array');
+  constr('Float64Array');
+
+  return out;
+};

package/compiler/builtins/z_ecma262.ts

@@ -0,0 +1,62 @@
+// general widely used ecma262/spec functions
+
+// 7.1.5 ToIntegerOrInfinity (argument)
+// https://tc39.es/ecma262/#sec-tointegerorinfinity
+export const __ecma262_ToIntegerOrInfinity = (argument: unknown): number => {
+  // 1. Let number be ? ToNumber(argument).
+  let number: number = Number(argument);
+
+  // 2. If number is one of NaN, +0𝔽, or -0𝔽, return 0.
+  if (Number.isNaN(number)) return 0;
+
+  // 3. If number is +∞𝔽, return +∞.
+  // 4. If number is -∞𝔽, return -∞.
+  if (!Number.isFinite(number)) return number;
+
+  // 5. Return truncate(ℝ(number)).
+  number = Math.trunc(number);
+
+  // return 0 for -0
+  if (number == 0) return 0;
+  return number;
+};
+
+// todo: support non-bytestring properly
+// 7.1.17 ToString (argument)
+// https://tc39.es/ecma262/#sec-tostring
+export const __ecma262_ToString = (argument: unknown): bytestring => {
+  let out: bytestring = '';
+  const type: i32 = Porffor.rawType(argument);
+
+  // 1. If argument is a String, return argument.
+  if (Porffor.fastOr(
+    type == Porffor.TYPES.string,
+    type == Porffor.TYPES.bytestring)) return argument;
+
+  // 2. If argument is a Symbol, throw a TypeError exception.
+  if (type == Porffor.TYPES.symbol) throw new TypeError('Cannot convert a Symbol value to a string');
+
+  // 3. If argument is undefined, return "undefined".
+  if (type == Porffor.TYPES.undefined) return out = 'undefined';
+
+  // 4. If argument is null, return "null".
+  if (Porffor.fastAnd(
+    type == Porffor.TYPES.object,
+    argument == 0)) return out = 'null';
+
+  if (type == Porffor.TYPES.boolean) {
+    // 5. If argument is true, return "true".
+    if (argument == true) return out = 'true';
+
+    // 6. If argument is false, return "false".
+    return out = 'false';
+  }
+
+  // 7. If argument is a Number, return Number::toString(argument, 10).
+  // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
+  // 9. Assert: argument is an Object.
+  // 10. Let primValue be ? ToPrimitive(argument, string).
+  // 11. Assert: primValue is not an Object.
+  // 12. Return ? ToString(primValue).
+  return argument.toString();
+};