porffor 0.57.0 → 0.57.2

package/CONTRIBUTING.md

@@ -21,7 +21,7 @@ The repo comes with easy alias scripts for Unix and Windows, which you can use l
 - Unix: `./porf path/to/script.js`
 - Windows: `.\porf path/to/script.js`
 
-You can also swap out `node` in the alias to use another runtime like Deno (`deno run -A ...`) or Bun (`bun ...`), or just use it yourself (eg `node runner/index.js ...`, `bun runner/index.js ...`). Node, Deno, Bun should work.
+You can also swap out `node` in the alias to use another runtime like Deno (`deno run -A ...`) or Bun (`bun ...`), or just use it yourself (eg `node runtime/index.js ...`, `bun runtime/index.js ...`). Node, Deno, Bun should work.
 
 ### Precompile
 

package/README.md

@@ -122,7 +122,7 @@ Porffor can run Test262 via some hacks/transforms which remove unsupported featu
   - `wasmSpec.js`: "enums"/info from wasm spec
   - `wrap.js`: wrapper for compiler which instantiates and produces nice exports
 
-- `runner`: contains utils for running JS with the compiler
+- `runtime`: contains utils for running JS with the compiler
   - `index.js`: the main file, you probably want to use this
   - `repl.js`: basic repl (uses `node:repl`)
 

package/compiler/2c.js

@@ -1,4 +1,4 @@
-import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
+import { read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
 import { Blocktype, Opcodes, Valtype, PageSize } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
 import { log } from './log.js';

package/compiler/builtins/array.ts

@@ -65,7 +65,7 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
   }
 
   if (Porffor.type(arg) == Porffor.TYPES.object) {
-    let len = ecma262.ToIntegerOrInfinity((arg as object)['length']);
+    let len: i32 = ecma262.ToIntegerOrInfinity((arg as object)['length']);
     if (len > 4294967295) throw new RangeError('Invalid array length');
     if (len < 0) len = 0;
 

package/compiler/builtins/base64.ts

@@ -15,7 +15,7 @@ export const btoa = (input: bytestring): bytestring => {
 
   // todo/perf: add some per 6 char variant using bitwise magic?
 
-  const endPtr = i + len;
+  const endPtr: i32 = i + len;
   while (i < endPtr) {
     const chr1: i32 = Porffor.wasm.i32.load8_u(i++, 0, 4);
     const chr2: i32 = i < endPtr ? Porffor.wasm.i32.load8_u(i++, 0, 4) : -1;
@@ -54,7 +54,7 @@ export const atob = (input: bytestring): bytestring => {
   let i: i32 = Porffor.wasm`local.get ${input}`,
       j: i32 = Porffor.wasm`local.get ${output}`;
 
-  const endPtr = i + input.length;
+  const endPtr: i32 = 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;

package/compiler/builtins/console.ts

@@ -86,27 +86,27 @@ export const __Porffor_miniLog = (arg: any) => {
   Porffor.printStatic('\n');
 };
 
-export const __Porffor_printArray = (arg: any[]|Uint8Array|Int8Array|Uint8ClampedArray|Uint16Array|Int16Array|Uint32Array|Int32Array|Float32Array|Float64Array, colors: boolean, length: boolean = false) => {
-  const arrLen: i32 = arg.length;
-  if (length) {
-    Porffor.printStatic('(');
-    print(arrLen);
-    Porffor.printStatic(') ');
-  }
+export const __Porffor_print = (arg: any, colors: boolean = true, depth: number = 0) => {
+  const __Porffor_printArray = (arg: any[]|Uint8Array|Int8Array|Uint8ClampedArray|Uint16Array|Int16Array|Uint32Array|Int32Array|Float32Array|Float64Array, colors: boolean, length: boolean = false) => {
+    const arrLen: i32 = arg.length;
+    if (length) {
+      Porffor.printStatic('(');
+      print(arrLen);
+      Porffor.printStatic(') ');
+    }
 
-  if (arrLen == 0) {
-    Porffor.printStatic('[]');
-  } else {
-    Porffor.printStatic('[ ');
-    for (let i: i32 = 0; i < arrLen; i++) {
-      __Porffor_print(arg[i], colors);
-      if (i != arrLen - 1) Porffor.printStatic(', ');
+    if (arrLen == 0) {
+      Porffor.printStatic('[]');
+    } else {
+      Porffor.printStatic('[ ');
+      for (let i: i32 = 0; i < arrLen; i++) {
+        __Porffor_print(arg[i], colors);
+        if (i != arrLen - 1) Porffor.printStatic(', ');
+      }
+      Porffor.printStatic(' ]');
     }
-    Porffor.printStatic(' ]');
-  }
-};
+  };
 
-export const __Porffor_print = (arg: any, colors: boolean = true, depth: number = 0) => {
   // todo: Symbol.toStringTag could reduce duplication here
   switch (Porffor.type(arg)) {
     case Porffor.TYPES.number:
@@ -335,7 +335,7 @@ export const __Porffor_print = (arg: any, colors: boolean = true, depth: number
   }
 };
 
-let tabLevel = 0;
+let tabLevel: i32 = 0;
 export const __Porffor_consoleIndent = () => {
   for (let i: i32 = 0; i < tabLevel; i++) {
     Porffor.printStatic('\t');
@@ -459,7 +459,7 @@ export const __Porffor_dirObject = (obj: any, colors: boolean, depth: i32, showH
 
   const keys = __Object_keys(obj);
   const keysLen = keys.length - 1;
-  for (let i = 0; i <= keysLen; i++) {
+  for (let i: i32 = 0; i <= keysLen; i++) {
     const key = keys[i];
     __Porffor_consolePrint(key);
     Porffor.printStatic(': ');

package/compiler/builtins/date.ts

@@ -147,7 +147,7 @@ export const __ecma262_DateFromTime = (t: number): number => {
   const dayWithinYear: number = __ecma262_DayWithinYear(t);
 
   // 3. Let month be MonthFromTime(t).
-  const month = __ecma262_MonthFromTime(t);
+  const month: number = __ecma262_MonthFromTime(t);
 
   // 4. If month is +0𝔽, return dayWithinYear + 1𝔽.
   if (month == 0) return dayWithinYear + 1;

package/compiler/builtins/number.ts

@@ -694,7 +694,7 @@ export const parseFloat = (input: any): f64 => {
   let dec: i32 = 0;
   let negative: boolean = false;
 
-  let i = 0;
+  let i: i32 = 0;
   const start: i32 = input.charCodeAt(0);
 
   // +, ignore

package/compiler/builtins/object.ts

@@ -168,7 +168,7 @@ export const __Porffor_object_in = (obj: any, prop: any): boolean => {
     return true;
   }
 
-  let lastProto = obj;
+  let lastProto: any = obj;
   while (true) {
     obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.type(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
@@ -189,7 +189,7 @@ export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: a
     return false;
   }
 
-  let lastProto = obj;
+  let lastProto: any = obj;
   while (true) {
     obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.type(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
@@ -347,7 +347,7 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|u
   if (entryPtr == -1) {
     if (Porffor.type(obj) == Porffor.TYPES.function) {
       // hack: function .name and .length
-      const v = obj[p];
+      const v: any = obj[p];
       if (v != null) {
         const out: object = {};
         out.writable = false;
@@ -619,7 +619,7 @@ export const __Object_create = (proto: any, props: any): object => {
 export const __Object_groupBy = (items: any, callbackFn: any): object => {
   const out: object = {};
 
-  let i = 0;
+  let i: i32 = 0;
   for (const x of items) {
     const k: any = callbackFn(x, i++);
     if (!__Object_hasOwn(out, k)) {

package/compiler/builtins/promise.ts

@@ -383,18 +383,18 @@ export const __Promise_allSettled = (promises: any): Promise => {
       _allLen++;
       if (__ecma262_IsPromise(x)) {
         x.then(r => {
-          const o = {};
+          const o: object = {};
           o.status = 'fulfilled';
           o.value = r;
           if (Porffor.array.fastPush(_allOut, o) == _allLen) _allRes(_allOut);
         }, r => {
-          const o = {};
+          const o: object = {};
           o.status = 'rejected';
           o.reason = r;
           if (Porffor.array.fastPush(_allOut, o) == _allLen) _allRes(_allOut);
         });
       } else {
-        const o = {};
+        const o: object = {};
         o.status = 'fulfilled';
         o.value = x;
         Porffor.array.fastPush(_allOut, o);

package/compiler/builtins/string.ts

@@ -1227,12 +1227,26 @@ memory.copy 0 0`;
 
 export const __String_prototype_split = (_this: string, separator: any, limit: any) => {
   let out: any[] = Porffor.allocate(), outLen: i32 = 0;
-  const sType: i32 = Porffor.TYPES.string;
 
   if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
   limit |= 0;
   if (limit < 0) limit = Number.MAX_SAFE_INTEGER;
 
+  if (separator == null) {
+    out.length = 1;
+    // out[0] = _this; (but in wasm as it is a f64 array and we are in i32 space)
+    Porffor.wasm`
+local.get ${out}
+local.get ${_this}
+f64.convert_i32_u
+f64.store 0 4
+
+local.get ${out}
+i32.const 67
+i32.store8 0 12`;
+    return out;
+  }
+
   let tmp: string = Porffor.allocate(), tmpLen: i32 = 0;
   const thisLen: i32 = _this.length * 2, sepLen: i32 = separator.length;
   if (sepLen == 1) {
@@ -1263,7 +1277,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${sType}
+i32.const 67
 i32.store8 0 12`;
         outLen++;
 
@@ -1275,6 +1289,36 @@ i32.store8 0 12`;
       Porffor.wasm.i32.store16(Porffor.wasm`local.get ${tmp}` + tmpLen * 2, x, 0, 4);
       tmpLen++;
     }
+  } else if (sepLen == 0) {
+    const clammedLimit: i32 = limit > thisLen ? thisLen : limit;
+    tmpLen = 1;
+    for (let i = 0; i <= clammedLimit; i+=2) {
+      tmp = Porffor.allocateBytes(8);
+      const x: i32 = Porffor.wasm.i32.load16_u(Porffor.wasm`local.get ${_this}` + i, 0, 4);
+
+      Porffor.wasm.i32.store16(Porffor.wasm`local.get ${tmp}`, x, 0, 4);
+      tmp.length = tmpLen;
+      out.length = outLen;
+
+Porffor.wasm`
+local.get ${out}
+local.get ${outLen}
+i32.const 9
+i32.mul
+i32.add
+local.get ${tmp}
+f64.convert_i32_u
+f64.store 0 4
+local.get ${out}
+local.get ${outLen}
+i32.const 9
+i32.mul
+i32.add
+i32.const 67
+i32.store8 0 12`;
+      outLen++;
+    }
+    return out;
   } else {
     let sepInd: i32 = 0;
     for (let i: i32 = 0; i < thisLen; i += 2) {
@@ -1303,7 +1347,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${sType}
+i32.const 67
 i32.store8 0 12`;
           outLen++;
 
@@ -1335,7 +1379,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${sType}
+i32.const 67
 i32.store8 0 12`;
     outLen++;
   }
@@ -1346,7 +1390,21 @@ i32.store8 0 12`;
 
 export const __ByteString_prototype_split = (_this: bytestring, separator: any, limit: any) => {
   let out: any[] = Porffor.allocate(), outLen: i32 = 0;
-  const bsType: i32 = Porffor.TYPES.bytestring;
+
+  if (separator == null) {
+    out.length = 1;
+    // out[0] = _this; (but in wasm as it is a f64 array and we are in i32 space)
+    Porffor.wasm`
+local.get ${out}
+local.get ${_this}
+f64.convert_i32_u
+f64.store 0 4
+
+local.get ${out}
+i32.const 195
+i32.store8 0 12`;
+    return out;
+  }
 
   if (Porffor.wasm`local.get ${limit+1}` == Porffor.TYPES.undefined) limit = Number.MAX_SAFE_INTEGER;
   limit |= 0;
@@ -1382,7 +1440,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${bsType}
+i32.const 195
 i32.store8 0 12`;
         outLen++;
 
@@ -1394,6 +1452,37 @@ i32.store8 0 12`;
       Porffor.wasm.i32.store8(Porffor.wasm`local.get ${tmp}` + tmpLen, x, 0, 4);
       tmpLen++;
     }
+  } else if (sepLen == 0) {
+    const clammedLimit: i32 = limit > thisLen ? thisLen : limit;
+    tmpLen = 1;
+    for (let i = 0; i <= clammedLimit; i++) {
+      tmp = Porffor.allocateBytes(8);
+      const x: i32 = Porffor.wasm.i32.load8_u(Porffor.wasm`local.get ${_this}` + i, 0, 4);
+
+      Porffor.wasm.i32.store8(Porffor.wasm`local.get ${tmp}`, x, 0, 4);
+      tmp.length = tmpLen;
+      out.length = outLen;
+
+Porffor.wasm`
+local.get ${out}
+local.get ${outLen}
+i32.const 9
+i32.mul
+i32.add
+local.get ${tmp}
+f64.convert_i32_u
+f64.store 0 4
+
+local.get ${out}
+local.get ${outLen}
+i32.const 9
+i32.mul
+i32.add
+i32.const 195
+i32.store8 0 12`;
+      outLen++;
+    }
+    return out;
   } else {
     let sepInd: i32 = 0;
     for (let i: i32 = 0; i < thisLen; i++) {
@@ -1422,7 +1511,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${bsType}
+i32.const 195
 i32.store8 0 12`;
           outLen++;
 
@@ -1454,7 +1543,7 @@ local.get ${outLen}
 i32.const 9
 i32.mul
 i32.add
-local.get ${bsType}
+i32.const 195
 i32.store8 0 12`;
     outLen++;
   }