porffor 0.56.3 → 0.56.5

package/compiler/2c.js

@@ -395,6 +395,21 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     for (let _ = 0; _ < f.wasm.length; _++) {
       const i = f.wasm[_];
 
+      if (i[0] === null && i[1] === 'c') {
+        // inline c
+        let c = i[2];
+        c = c.replace(/^\s*(?:(?:inline|static)\s+)?\w+\s+\*?\s*\w+\s*\(.*?\)\s* {([\w\W]*?)\n}/gm, _ => {
+          prepend.set(_, _);
+          return '';
+        });
+        line(c);
+
+        // hack: add includes for some common calls
+        if (c.includes('printf')) includes.set('stdio.h', true);
+
+        continue;
+      }
+
       if (i[0] === null && i[1] === 'dlopen') {
         // special ffi time
         const path = i[2];
@@ -607,6 +622,11 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
                 winIncludes.set('windows.h', true);
                 break;
 
+              case 'timeOrigin':
+                // todo: actually implement
+                vals.push('0');
+                break;
+
               case '__Porffor_readArgv': {
                 prepend.set('__Porffor_readArgv',
 `i32 __Porffor_readArgv(u32 index, u32 outPtr) {
@@ -721,7 +741,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           break;
 
         case Opcodes.call_indirect:
-          // todo: stub
+          // stub
           if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[2m(${f.name})`);
           vals.pop();
           vals.push('0', '0');
@@ -774,10 +794,15 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
         }
 
         case Opcodes.throw: {
-          // todo: actually print exception
-          vals.pop();
-          vals.pop();
-          line(`printf("Uncaught exception\\n")`);
+          // todo: allow catching
+          const type = vals.pop();
+          const val = vals.pop();
+          line(`printf("Uncaught ")`);
+
+          const id = tmpId++;
+          line(`const struct ReturnValue _t${id} = __ecma262_ToString(${val}, ${type})`);
+          line(`__Porffor_printString(_t${id}.value, _t${id}.type)`);
+          line(`printf("\\n")`);
           line(`exit(1)`);
 
           includes.set('stdio.h', true);
@@ -827,24 +852,13 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           includes.set('math.h', true);
           break;
         case Opcodes.f64_trunc:
-          // vals.push(`trunc(${vals.pop()})`);
-          // includes.set('math.h', true);
-
-          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster with clang??
+          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster than math.h's trunc() with clang??
           break;
         case Opcodes.f64_nearest:
           vals.push(`round(${vals.pop()})`);
           includes.set('math.h', true);
           break;
 
-        // case Opcodes.f64_sqrt: {
-        //   break;
-        // }
-
-        // case Opcodes.f64_copysign: {
-        //   break;
-        // }
-
         case Opcodes.memory_grow: {
           const id = localTmpId++;
           line(`const u32 _oldPages${id} = _memoryPages`);

package/compiler/builtins/array.ts

@@ -39,14 +39,12 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
   if (arg == null) throw new TypeError('Argument cannot be nullish');
 
   let out: any[] = Porffor.allocate();
-  let len: i32 = 0;
 
-  const type = Porffor.type(arg);
   if (Porffor.fastOr(
-    type == Porffor.TYPES.array,
-    type == Porffor.TYPES.string, type == Porffor.TYPES.bytestring,
-    type == Porffor.TYPES.set,
-    Porffor.fastAnd(type >= Porffor.TYPES.uint8array, type <= Porffor.TYPES.float64array)
+    Porffor.type(arg) == Porffor.TYPES.array,
+    Porffor.type(arg) == Porffor.TYPES.string, Porffor.type(arg) == Porffor.TYPES.bytestring,
+    Porffor.type(arg) == Porffor.TYPES.set,
+    Porffor.fastAnd(Porffor.type(arg) >= Porffor.TYPES.uint8array, Porffor.type(arg) <= Porffor.TYPES.float64array)
   )) {
     let i: i32 = 0;
     if (Porffor.type(mapFn) != Porffor.TYPES.undefined) {
@@ -62,20 +60,23 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
       }
     }
 
-    len = i;
+    out.length = i;
+    return out;
   }
 
-  if (type == Porffor.TYPES.object) {
-    len = ecma262.ToIntegerOrInfinity((arg as object)['length']);
+  if (Porffor.type(arg) == Porffor.TYPES.object) {
+    let len = ecma262.ToIntegerOrInfinity((arg as object)['length']);
     if (len > 4294967295) throw new RangeError('Invalid array length');
     if (len < 0) len = 0;
 
     for (let i: i32 = 0; i < len; i++) {
       out[i] = (arg as object)[i];
     }
+
+    out.length = len;
+    return out;
   }
 
-  out.length = len;
   return out;
 };
 
@@ -646,16 +647,14 @@ export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
 
       // 23.1.3.30.2 CompareArrayElements (x, y, comparefn)
       // https://tc39.es/ecma262/#sec-comparearrayelements
-      const xt: i32 = Porffor.type(x);
-      const yt: i32 = Porffor.type(y);
       let v: number;
 
       // 1. If x and y are both undefined, return +0𝔽.
-      if (xt == Porffor.TYPES.undefined && yt == Porffor.TYPES.undefined) v = 0;
+      if (Porffor.type(x) == Porffor.TYPES.undefined && Porffor.type(y) == Porffor.TYPES.undefined) v = 0;
         // 2. If x is undefined, return 1𝔽.
-        else if (xt == Porffor.TYPES.undefined) v = 1;
+        else if (Porffor.type(x) == Porffor.TYPES.undefined) v = 1;
         // 3. If y is undefined, return -1𝔽.
-        else if (yt == Porffor.TYPES.undefined) v = -1;
+        else if (Porffor.type(y) == Porffor.TYPES.undefined) v = -1;
         else {
           // 4. If comparefn is not undefined, then
           // a. Let v be ? ToNumber(? Call(comparefn, undefined, « x, y »)).
@@ -690,10 +689,9 @@ export const __Array_prototype_toString = (_this: any[]) => {
     if (i > 0) Porffor.bytestring.appendChar(out, 44);
 
     const element: any = _this[i++];
-    const type: i32 = Porffor.type(element);
     if (element != 0 || Porffor.fastAnd(
-      type != Porffor.TYPES.undefined, // undefined
-      type != Porffor.TYPES.object // null
+      Porffor.type(element) != Porffor.TYPES.undefined, // undefined
+      Porffor.type(element) != Porffor.TYPES.object // null
     )) {
       Porffor.bytestring.appendStr(out, ecma262.ToString(element));
     }
@@ -722,10 +720,9 @@ export const __Array_prototype_join = (_this: any[], _separator: any) => {
     if (i > 0) Porffor.bytestring.appendStr(out, separator);
 
     const element: any = _this[i++];
-    const type: i32 = Porffor.type(element);
     if (element != 0 || Porffor.fastAnd(
-      type != Porffor.TYPES.undefined, // undefined
-      type != Porffor.TYPES.object // null
+      Porffor.type(element) != Porffor.TYPES.undefined, // undefined
+      Porffor.type(element) != Porffor.TYPES.object // null
     )) {
       Porffor.bytestring.appendStr(out, ecma262.ToString(element));
     }
@@ -892,4 +889,43 @@ export const __Porffor_array_fastIndexOf = (arr: any[], el: number): i32 => {
   }
 
   return -1;
+};
+
+// functional to arr.splice(i, 1)
+export const __Porffor_array_fastRemove = (arr: any[], i: i32, len: i32): void => {
+  arr.length = len - 1;
+
+  // offset all elements after by -1 ind
+  Porffor.wasm`
+local offset i32
+local.get ${i}
+i32.to_u
+i32.const 9
+i32.mul
+local.get ${arr}
+i32.to_u
+i32.add
+i32.const 4
+i32.add
+local.set offset
+
+;; dst = offset (this element)
+local.get offset
+
+;; src = offset + 9 (this element + 1 element)
+local.get offset
+i32.const 9
+i32.add
+
+;; size = (size - i - 1) * 9
+local.get ${len}
+local.get ${i}
+f64.sub
+i32.to_u
+i32.const 1
+i32.sub
+i32.const 9
+i32.mul
+
+memory.copy 0 0`;
 };

package/compiler/builtins/arraybuffer.ts

@@ -1,12 +1,10 @@
 import type {} from './porffor.d.ts';
 
 export const __ArrayBuffer_isView = (value: any): boolean => {
-  const t: i32 = Porffor.type(value);
-  if (Porffor.fastOr(
-    t == Porffor.TYPES.dataview,
-    Porffor.fastAnd(t >= Porffor.TYPES.uint8array, t <= Porffor.TYPES.float64array)
-  )) return true;
-  return false;
+  return Porffor.fastOr(
+    Porffor.type(value) == Porffor.TYPES.dataview,
+    Porffor.fastAnd(Porffor.type(value) >= Porffor.TYPES.uint8array, Porffor.type(value) <= Porffor.TYPES.float64array)
+  );
 };
 
 export const __Porffor_arraybuffer_detach = (buffer: any): void => {

package/compiler/builtins/dataview.ts

@@ -9,10 +9,9 @@ export const DataView = function (arg: any, byteOffset: any, length: any): DataV
   let len: i32 = 0;
   let bufferPtr: i32;
 
-  const type: i32 = Porffor.type(arg);
   if (Porffor.fastOr(
-    type == Porffor.TYPES.arraybuffer,
-    type == Porffor.TYPES.sharedarraybuffer
+    Porffor.type(arg) == Porffor.TYPES.arraybuffer,
+    Porffor.type(arg) == Porffor.TYPES.sharedarraybuffer
   )) {
     bufferPtr = Porffor.wasm`local.get ${arg}`;
 

package/compiler/builtins/date.ts

@@ -1925,19 +1925,16 @@ export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown
     // 4. Else if numberOfArgs = 1, the n
     // a. Let value be values[0].
     const value: any = v0;
-
-    const valueType: i32 = Porffor.type(v0);
-
     let tv: number = 0;
 
     // b. If value is an Object and value has a [[DateValue]] internal slot, then
-    if (valueType == Porffor.TYPES.date) {
+    if (Porffor.type(v0) == Porffor.TYPES.date) {
       // i. Let tv be value.[[DateValue]].
       tv = __Porffor_date_read(value);
     } else {
       // c. Else,
       // ii. If v is a String, then
-      if (Porffor.fastOr(valueType == Porffor.TYPES.string, valueType == Porffor.TYPES.bytestring)) {
+      if (Porffor.fastOr(Porffor.type(v0) == Porffor.TYPES.string, Porffor.type(v0) == Porffor.TYPES.bytestring)) {
         // 1. Assert: The next step never returns an abrupt completion because v is a String.
 
         // 2. Let tv be the result of parsing v as a date, in exactly the same manner as for the parse method (21.4.3.2).

package/compiler/builtins/json.ts

@@ -6,10 +6,9 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
   if (value === true) return 'true';
   if (value === false) return 'false';
 
-  const t: i32 = Porffor.type(value);
   if (Porffor.fastOr(
-    (t | 0b10000000) == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.stringobject
+    (Porffor.type(value) | 0b10000000) == Porffor.TYPES.bytestring,
+    Porffor.type(value) == Porffor.TYPES.stringobject
   )) { // string
     const out: bytestring = Porffor.allocate();
     Porffor.bytestring.appendChar(out, 34); // start "
@@ -71,14 +70,14 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
   }
 
   if (Porffor.fastOr(
-    t == Porffor.TYPES.number,
-    t == Porffor.TYPES.numberobject
+    Porffor.type(value) == Porffor.TYPES.number,
+    Porffor.type(value) == Porffor.TYPES.numberobject
   )) { // number
     if (Number.isFinite(value)) return __Number_prototype_toString(value, 10);
     return 'null';
   }
 
-  if (t == Porffor.TYPES.array) {
+  if (Porffor.type(value) == Porffor.TYPES.array) {
     const out: bytestring = Porffor.allocate();
     Porffor.bytestring.appendChar(out, 91); // [
 
@@ -115,7 +114,7 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     return out;
   }
 
-  if (t > 0x06) {
+  if (Porffor.type(value) > 0x06) {
     // non-function object
     const out: bytestring = Porffor.allocate();
     Porffor.bytestring.appendChar(out, 123); // {
@@ -167,7 +166,7 @@ export const __Porffor_json_serialize = (value: any, depth: i32, space: bytestri
     return out;
   }
 
-  if (t == 0x04) {
+  if (Porffor.type(value) == 0x04) {
     // bigint
     throw new TypeError('Cannot serialize BigInts');
   }

package/compiler/builtins/{z_map.ts → map.ts}

@@ -5,31 +5,33 @@ export const __Map_prototype_size$get = (_this: Map) => {
 };
 
 export const __Map_prototype_has = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
-  return __Set_prototype_has(keys, key);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
+  for (const x of keys) {
+    if (x === key) return true;
+  }
+
+  return false;
 };
 
 export const __Map_prototype_get = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) return vals[i];
+    if (keys[i] === key) return vals[i];
   }
 
   return undefined;
 };
 
 export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
+  const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) {
+    if (keys[i] === key) {
       vals[i] = value;
       return _this;
     }
@@ -37,28 +39,24 @@ export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
 
   // add key if non-existent
   // increment size by 1
-  Porffor.wasm.i32.store(keys, size + 1, 0, 0);
+  keys.length = size + 1;
 
-  // write new key at end
-  Porffor.set.write(keys, size, key);
-
-  // write new value at end
+  // write new key and value at end
+  keys[size] = key;
   vals[size] = value;
 
   return _this;
 };
 
 export const __Map_prototype_delete = (_this: Map, key: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
-
+  const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (Porffor.set.read(keys, i) === key) {
-      __Set_prototype_delete(keys, key);
-      __Array_prototype_splice(vals, i, 1);
-
+    if (keys[i] === key) {
+      Porffor.array.fastRemove(keys, i, size);
+      Porffor.array.fastRemove(vals, i, size);
       return true;
     }
   }
@@ -67,22 +65,22 @@ export const __Map_prototype_delete = (_this: Map, key: any) => {
 };
 
 export const __Map_prototype_clear = (_this: Map) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
-  __Set_prototype_clear(keys);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
+  keys.length = 0;
 
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
   vals.length = 0;
 };
 
 export const __Map_prototype_forEach = (_this: Map, callbackFn: any) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
 
   let i: i32 = 0;
   while (i < size) {
-    callbackFn(vals[i], Porffor.set.read(keys, i++), _this);
+    callbackFn(vals[i], keys[i++], _this);
   }
 };
 
@@ -91,10 +89,9 @@ export const Map = function (iterable: any): Map {
 
   const out: Map = Porffor.allocateBytes(8);
 
-  const keys: Set = Porffor.allocate();
-  Porffor.wasm.i32.store(out, keys, 0, 0);
-
+  const keys: any[] = Porffor.allocate();
   const vals: any[] = Porffor.allocate();
+  Porffor.wasm.i32.store(out, keys, 0, 0);
   Porffor.wasm.i32.store(out, vals, 0, 4);
 
   if (iterable != null) for (const x of iterable) {
@@ -106,7 +103,7 @@ export const Map = function (iterable: any): Map {
 };
 
 export const __Map_prototype_keys = (_this: Map) => {
-  const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   const out: any[] = Porffor.allocate();
 
   for (const x of keys) {

package/compiler/builtins/object.ts

@@ -20,8 +20,7 @@ export const __Object_keys = (obj: any): any[] => {
   const out: any[] = Porffor.allocate();
 
   obj = __Porffor_object_underlying(obj);
-  const t: i32 = Porffor.type(obj);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(obj) == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
     const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
@@ -76,8 +75,7 @@ export const __Object_values = (obj: any): any[] => {
   const out: any[] = Porffor.allocate();
 
   obj = __Porffor_object_underlying(obj);
-  const t: i32 = Porffor.type(obj);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(obj) == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
     const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
@@ -146,8 +144,7 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
   if (_this == null) throw new TypeError('Argument is nullish, expected object');
   const p: any = ecma262.ToPropertyKey(prop);
 
-  const t: i32 = Porffor.type(_this);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(_this) == Porffor.TYPES.object) {
     return Porffor.object.lookup(_this, p, __Porffor_object_hash(p)) != -1;
   }
 
@@ -414,8 +411,7 @@ export const __Object_getOwnPropertyNames = (obj: any): any[] => {
   const out: any[] = Porffor.allocate();
 
   obj = __Porffor_object_underlying(obj);
-  const t: i32 = Porffor.type(obj);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(obj) == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
     const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
@@ -469,8 +465,7 @@ export const __Object_getOwnPropertySymbols = (obj: any): any[] => {
   const out: any[] = Porffor.allocate();
 
   obj = __Porffor_object_underlying(obj);
-  const t: i32 = Porffor.type(obj);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(obj) == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
     const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
@@ -686,22 +681,20 @@ export const __Object_prototype_toString = (_this: any) => {
   if (_this === null) return '[object Null]';
 
   // todo: toStringTag support
-
-  const t: i32 = Porffor.type(_this);
-  if (t == Porffor.TYPES.array) return '[object Array]';
-  if (t == Porffor.TYPES.function) return '[object Function]';
+  if (Porffor.type(_this) == Porffor.TYPES.array) return '[object Array]';
+  if (Porffor.type(_this) == Porffor.TYPES.function) return '[object Function]';
   if (Porffor.fastOr(
-    t == Porffor.TYPES.boolean,
-    t == Porffor.TYPES.booleanobject)) return '[object Boolean]';
+    Porffor.type(_this) == Porffor.TYPES.boolean,
+    Porffor.type(_this) == Porffor.TYPES.booleanobject)) return '[object Boolean]';
   if (Porffor.fastOr(
-    t == Porffor.TYPES.number,
-    t == Porffor.TYPES.numberobject)) return '[object Number]';
+    Porffor.type(_this) == Porffor.TYPES.number,
+    Porffor.type(_this) == Porffor.TYPES.numberobject)) return '[object Number]';
   if (Porffor.fastOr(
-    t == Porffor.TYPES.string,
-    t == Porffor.TYPES.bytestring,
-    t == Porffor.TYPES.stringobject)) return '[object String]';
-  if (t == Porffor.TYPES.date) return '[object Date]';
-  if (t == Porffor.TYPES.regexp) return '[object RegExp]';
+    Porffor.type(_this) == Porffor.TYPES.string,
+    Porffor.type(_this) == Porffor.TYPES.bytestring,
+    Porffor.type(_this) == Porffor.TYPES.stringobject)) return '[object String]';
+  if (Porffor.type(_this) == Porffor.TYPES.date) return '[object Date]';
+  if (Porffor.type(_this) == Porffor.TYPES.regexp) return '[object RegExp]';
 
   return '[object Object]';
 };

package/compiler/builtins/porffor.d.ts

@@ -38,6 +38,7 @@ type PorfforGlobal = {
   array: {
     fastPush(arr: any[], el: any): i32;
     fastIndexOf(arr: any[], el: any): i32;
+    fastRemove(arr: any[], i: i32): void;
   }
 
   arraybuffer: {

package/compiler/builtins/reflect.ts

@@ -89,8 +89,7 @@ export const __Reflect_ownKeys = (target: any) => {
   const out: any[] = Porffor.allocate();
 
   target = __Porffor_object_underlying(target);
-  const t: i32 = Porffor.type(target);
-  if (t == Porffor.TYPES.object) {
+  if (Porffor.type(target) == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${target}` + 8;
     const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(target, 0, 0) * 18;