porffor 0.56.3 → 0.56.5

package/compiler/builtins/set.ts

@@ -1,50 +1,5 @@
 import type {} from './porffor.d.ts';
 
-// dark wasm magic for dealing with memory, sorry.
-export const __Porffor_set_read = (set: Set, index: number): any => {
-  Porffor.wasm`
-local offset i32
-local.get ${index}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${set}
-i32.to_u
-i32.add
-local.set offset
-
-local.get offset
-f64.load 0 4
-
-local.get offset
-i32.load8_u 0 12
-return`;
-};
-
-export const __Porffor_set_write = (set: Set, index: number, value: any): boolean => {
-  Porffor.wasm`
-local offset i32
-local.get ${index}
-i32.to_u
-i32.const 9
-i32.mul
-local.get ${set}
-i32.to_u
-i32.add
-local.set offset
-
-local.get offset
-local.get ${value}
-f64.store 0 4
-
-local.get offset
-local.get ${value+1}
-i32.store8 0 12`;
-
-  return true;
-};
-
-
 export const __Set_prototype_size$get = (_this: Set) => {
   return Porffor.wasm.i32.load(_this, 0, 0);
 };
@@ -55,8 +10,7 @@ export const __Set_prototype_values = (_this: Set) => {
 
   const out: any[] = __Porffor_allocate();
   for (let i: number = 0; i < size; i++) {
-    const val: any = __Porffor_set_read(_this, i);
-    Porffor.array.fastPush(out, val);
+    Porffor.array.fastPush(out, (_this as any[])[i]);
   }
 
   return out;
@@ -70,7 +24,7 @@ export const __Set_prototype_has = (_this: Set, value: any) => {
   const size: number = Porffor.wasm.i32.load(_this, 0, 0);
 
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return true;
+    if ((_this as any[])[i] === value) return true;
   }
 
   return false;
@@ -81,7 +35,7 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
 
   // check if already in set
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) return _this;
+    if ((_this as any[])[i] === value) return _this;
   }
 
   // not, add it
@@ -89,55 +43,18 @@ export const __Set_prototype_add = (_this: Set, value: any) => {
   Porffor.wasm.i32.store(_this, size + 1, 0, 0);
 
   // write new value at end
-  __Porffor_set_write(_this, size, value);
+  (_this as any[])[size] = value;
 
   return _this;
 };
 
 export const __Set_prototype_delete = (_this: Set, value: any) => {
-  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
-
   // check if already in set
+  const size: number = Porffor.wasm.i32.load(_this, 0, 0);
   for (let i: number = 0; i < size; i++) {
-    if (__Porffor_set_read(_this, i) === value) {
+    if ((_this as any[])[i] === value) {
       // found, delete
-      // decrement size by 1
-      Porffor.wasm.i32.store(_this, size - 1, 0, 0);
-
-      // 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 ${_this}
-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 ${size}
-local.get ${i}
-f64.sub
-i32.to_u
-i32.const 1
-i32.sub
-i32.const 9
-i32.mul
-
-memory.copy 0 0`;
-
+      Porffor.array.fastRemove(_this, i, size);
       return true;
     }
   }
@@ -148,8 +65,7 @@ memory.copy 0 0`;
 
 export const __Set_prototype_clear = (_this: Set) => {
   // just set size to 0
-  // do not need to delete any as will not be accessed anymore,
-  // and will be overwritten with new add
+  // do not need to delete any as old will just be overwritten
   Porffor.wasm.i32.store(_this, 0, 0, 0);
 };
 

package/compiler/builtins/typedarray.js

@@ -18,10 +18,9 @@ export default async () => {
   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}\`;
 
@@ -45,17 +44,17 @@ export default async () => {
     Porffor.wasm.i32.store(outPtr, bufferPtr, 0, 4);
 
     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;
       for (const x of arg) {
         out[i++] = x;
       }
       len = i;
-    } else if (type == Porffor.TYPES.number) {
+    } else if (Porffor.type(arg) == Porffor.TYPES.number) {
       len = Math.trunc(arg);
     }
 
@@ -75,17 +74,14 @@ export const __${name}_from = (arg: any, mapFn: any): ${name} => {
   const arr: 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)
   )) {
-    const hasMapFn = Porffor.type(mapFn) != Porffor.TYPES.undefined;
-
     let i: i32 = 0;
-    if (hasMapFn) {
+    if (Porffor.type(mapFn) != Porffor.TYPES.undefined) {
       if (Porffor.type(mapFn) != Porffor.TYPES.function) throw new TypeError('Called Array.from with a non-function mapFn');
 
       for (const x of arg) {
@@ -132,8 +128,6 @@ export const __${name}_prototype_at = (_this: ${name}, index: number) => {
 
 export const __${name}_prototype_slice = (_this: ${name}, start: number, end: number) => {
   const len: i32 = _this.length;
-  if (Porffor.type(end) == Porffor.TYPES.undefined) end = len;
-
   start |= 0;
   end |= 0;
 
@@ -162,6 +156,52 @@ export const __${name}_prototype_slice = (_this: ${name}, start: number, end: nu
   return out;
 };
 
+export const __${name}_prototype_set = (_this: ${name}, array: any, offset: number) => {
+  const len: i32 = _this.length;
+
+  offset |= 0;
+  if (Porffor.fastOr(offset < 0, offset > len)) throw new RangeError('Offset out of bounds');
+
+  if (Porffor.fastOr(
+    Porffor.type(array) == Porffor.TYPES.array,
+    Porffor.type(array) == Porffor.TYPES.string, Porffor.type(array) == Porffor.TYPES.bytestring,
+    Porffor.type(array) == Porffor.TYPES.set,
+    Porffor.fastAnd(Porffor.type(array) >= Porffor.TYPES.uint8array, Porffor.type(array) <= Porffor.TYPES.float64array)
+  )) {
+    let i: i32 = offset;
+    for (const x of array) {
+      _this[i++] = Porffor.type(x) == Porffor.TYPES.number ? x : 0;
+      if (i > len) throw new RangeError('Array is too long for given offset');
+    }
+  }
+};
+
+export const __${name}_prototype_subarray = (_this: ${name}, start: number, end: any) => {
+  const len: i32 = _this.length;
+  if (Porffor.type(end) == Porffor.TYPES.undefined) end = len;
+
+  start |= 0;
+  end |= 0;
+
+  if (start < 0) {
+    start = len + start;
+    if (start < 0) start = 0;
+  }
+  if (start > len) start = len;
+  if (end < 0) {
+    end = len + end;
+    if (end < 0) end = 0;
+  }
+  if (end > len) end = len;
+
+  const out: ${name} = Porffor.allocateBytes(12);
+  Porffor.wasm.i32.store(out, end - start, 0, 0);
+  Porffor.wasm.i32.store(out, Porffor.wasm.i32.load(_this, 0, 4) + start * ${name}.BYTES_PER_ELEMENT, 0, 4);
+  Porffor.wasm.i32.store(out, Porffor.wasm.i32.load(_this, 0, 8) + start * ${name}.BYTES_PER_ELEMENT, 0, 8);
+
+  return out;
+};
+
 ${typedArrayFuncs.reduce((acc, x) => acc + x.replace('// @porf-typed-array\n', '').replaceAll('Array', name).replaceAll('any[]', name) + '\n\n', '')}
 `;
 

package/compiler/builtins/{z_weakmap.ts → weakmap.ts}

@@ -1,21 +1,18 @@
 import type {} from './porffor.d.ts';
 
 export const __WeakMap_prototype_has = (_this: WeakMap, key: any) => {
-  const map: Map = _this;
-  return __Map_prototype_has(map, key);
+  return __Map_prototype_has(_this as Map, key);
 };
 
 export const __WeakMap_prototype_set = (_this: WeakMap, key: any, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(key)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  const map: Map = _this;
-  __Map_prototype_set(map, key, value);
+  __Map_prototype_set(_this as Map, key, value);
   return _this;
 };
 
 export const __WeakMap_prototype_delete = (_this: WeakMap, key: any) => {
-  const map: Map = _this;
-  return __Map_prototype_delete(map, key);
+  return __Map_prototype_delete(_this as Map, key);
 };
 
 export const WeakMap = function (iterable: any): WeakMap {
@@ -23,10 +20,9 @@ export const WeakMap = function (iterable: any): WeakMap {
 
   const out: WeakMap = 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) {

package/compiler/builtins/{z_weakset.ts → weakset.ts}

@@ -1,28 +1,24 @@
 import type {} from './porffor.d.ts';
 
 export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => {
-  const set: Set = _this;
-  return __Set_prototype_has(set, value);
+  return __Set_prototype_has(_this as Set, value);
 };
 
 export const __WeakSet_prototype_add = (_this: WeakSet, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(value)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  const set: Set = _this;
-  __Set_prototype_add(set, value);
+  __Set_prototype_add(_this as Set, value);
   return _this;
 };
 
 export const __WeakSet_prototype_delete = (_this: WeakSet, value: any) => {
-  const set: Set = _this;
-  return __Set_prototype_delete(set, value);
+  return __Set_prototype_delete(_this as Set, value);
 };
 
 export const WeakSet = function (iterable: any): WeakSet {
   if (!new.target) throw new TypeError("Constructor WeakSet requires 'new'");
 
   const out: WeakSet = __Porffor_allocate();
-
   if (iterable != null) for (const x of iterable) {
     __WeakSet_prototype_add(out, x);
   }

package/compiler/builtins/z_ecma262.ts

@@ -28,20 +28,18 @@ export const __ecma262_ToPrimitive_String = (input: any): any => {
 // 7.1.4 ToNumber (argument)
 // https://tc39.es/ecma262/#sec-tonumber
 export const __ecma262_ToNumber = (argument: unknown): number => {
-  const t: i32 = Porffor.type(argument);
-
   // 1. If argument is a Number, return argument.
-  if (t == Porffor.TYPES.number) return argument;
+  if (Porffor.type(argument) == Porffor.TYPES.number) return argument;
 
   // 2. If argument is either a Symbol or a BigInt, throw a TypeError exception.
   if (Porffor.fastOr(
-    t == Porffor.TYPES.symbol,
-    t == Porffor.TYPES.bigint)) throw new TypeError('Cannot convert Symbol or BigInt to a number');
+    Porffor.type(argument) == Porffor.TYPES.symbol,
+    Porffor.type(argument) == Porffor.TYPES.bigint)) throw new TypeError('Cannot convert Symbol or BigInt to a number');
 
   // 3. If argument is undefined, return NaN.
   if (Porffor.fastOr(
-    t == Porffor.TYPES.undefined,
-    t == Porffor.TYPES.empty)) return NaN;
+    Porffor.type(argument) == Porffor.TYPES.undefined,
+    Porffor.type(argument) == Porffor.TYPES.empty)) return NaN;
 
   // 4. If argument is either null or false, return +0𝔽.
   if (Porffor.fastOr(
@@ -54,8 +52,8 @@ export const __ecma262_ToNumber = (argument: unknown): number => {
 
   // 6. If argument is a String, return StringToNumber(argument).
   if (Porffor.fastOr(
-    t == Porffor.TYPES.string,
-    t == Porffor.TYPES.bytestring)) return __ecma262_StringToNumber(argument);
+    Porffor.type(argument) == Porffor.TYPES.string,
+    Porffor.type(argument) == Porffor.TYPES.bytestring)) return __ecma262_StringToNumber(argument);
 
   // 7. Assert: argument is an Object.
   // 8. Let primValue be ? ToPrimitive(argument, number).
@@ -124,27 +122,25 @@ export const __ecma262_ToIndex = (value: unknown): number => {
 // 7.1.17 ToString (argument)
 // https://tc39.es/ecma262/#sec-tostring
 export const __ecma262_ToString = (argument: unknown): any => {
-  const type: i32 = Porffor.type(argument);
-
   // 1. If argument is a String, return argument.
   if (Porffor.fastOr(
-    type == Porffor.TYPES.string,
-    type == Porffor.TYPES.bytestring)) return argument;
+    Porffor.type(argument) == Porffor.TYPES.string,
+    Porffor.type(argument) == 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');
+  if (Porffor.type(argument) == Porffor.TYPES.symbol) throw new TypeError('Cannot convert a Symbol value to a string');
 
   // 3. If argument is undefined, return "undefined".
   if (Porffor.fastOr(
-    type == Porffor.TYPES.undefined,
-    type == Porffor.TYPES.empty)) return 'undefined';
+    Porffor.type(argument) == Porffor.TYPES.undefined,
+    Porffor.type(argument) == Porffor.TYPES.empty)) return 'undefined';
 
   // 4. If argument is null, return "null".
   if (Porffor.fastAnd(
-    type == Porffor.TYPES.object,
+    Porffor.type(argument) == Porffor.TYPES.object,
     argument == 0)) return 'null';
 
-  if (type == Porffor.TYPES.boolean) {
+  if (Porffor.type(argument) == Porffor.TYPES.boolean) {
     // 5. If argument is true, return "true".
     if (argument == true) return 'true';
 
@@ -153,15 +149,15 @@ export const __ecma262_ToString = (argument: unknown): any => {
   }
 
   // 7. If argument is a Number, return Number::toString(argument, 10).
-  if (type == Porffor.TYPES.number) return __Number_prototype_toString(argument, 10);
+  if (Porffor.type(argument) == Porffor.TYPES.number) return __Number_prototype_toString(argument, 10);
 
   // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
   if (Porffor.comptime.flag`hasType.bigint`) {
-    if (type == Porffor.TYPES.bigint) return __Porffor_bigint_toString(argument, 10);
+    if (Porffor.type(argument) == Porffor.TYPES.bigint) return __Porffor_bigint_toString(argument, 10);
   }
 
   // hack: StringObject -> String
-  if (type == Porffor.TYPES.stringobject) {
+  if (Porffor.type(argument) == Porffor.TYPES.stringobject) {
     return argument as string;
   }