porffor 0.61.4 → 0.61.6

package/compiler/builtins/array.ts

@@ -35,7 +35,7 @@ export const Array = function (...args: any[]): any[] {
 export const __Array_isArray = (x: unknown): boolean =>
   Porffor.type(x) == Porffor.TYPES.array;
 
-export const __Array_from = (arg: any, mapFn: any): any[] => {
+export const __Array_from = (arg: any, mapFn: any, thisArg: any = undefined): any[] => {
   if (arg == null) throw new TypeError('Argument cannot be nullish');
 
   let out: any[] = Porffor.malloc();
@@ -51,7 +51,7 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
       if (Porffor.type(mapFn) != Porffor.TYPES.function) throw new TypeError('Called Array.from with a non-function mapFn');
 
       for (const x of arg) {
-        out[i] = mapFn(x, i);
+        out[i] = mapFn.call(thisArg, x, i);
         i++;
       }
     } else {
@@ -69,8 +69,16 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
     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];
+    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 (let i: i32 = 0; i < len; i++) {
+        out[i] = mapFn.call(thisArg, (arg as object)[i], i);
+      }
+    } else {
+      for (let i: i32 = 0; i < len; i++) {
+        out[i] = (arg as object)[i];
+      }
     }
 
     out.length = len;

package/compiler/builtins/error.js

@@ -4,7 +4,10 @@ export default () => {
   const errors = [];
   const error = name => {
     errors.push(name);
-    out += `export const ${name} = function (message: any): ${name} {
+    out += `
+export const ${name} = function (
+  ${name === 'AggregateError' ? 'errors: any,' : ''} message: any
+): ${name} {
   if (message === undefined) message = '';
     else message = ecma262.ToString(message);
 
@@ -12,6 +15,13 @@ export default () => {
   Porffor.wasm.i32.store(obj, message, 0, 0);
   Porffor.wasm.i32.store8(obj, Porffor.type(message), 0, 4);
 
+  // https://tc39.es/ecma262/multipage/fundamental-objects.html#sec-aggregate-error
+  ${name === 'AggregateError' ? `
+  const errorsList: any[] = __Array_from(errors);
+  // TODO: should not be enumerable
+  obj.errors = errorsList;
+  ` : ''}
+
   return obj;
 };
 

package/compiler/builtins/map.ts

@@ -7,7 +7,7 @@ export const __Map_prototype_size$get = (_this: Map) => {
 export const __Map_prototype_has = (_this: Map, key: any) => {
   const keys: any[] = Porffor.wasm.i32.load(_this, 0, 0);
   for (const x of keys) {
-    if (x === key) return true;
+    if (__ecma262_SameValueZero(x, key)) return true;
   }
 
   return false;
@@ -19,7 +19,7 @@ export const __Map_prototype_get = (_this: Map, key: any) => {
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
   for (let i: i32 = 0; i < size; i++) {
-    if (keys[i] === key) return vals[i];
+    if (__ecma262_SameValueZero(keys[i], key)) return vals[i];
   }
 
   return undefined;
@@ -31,7 +31,7 @@ export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
 
   const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (keys[i] === key) {
+    if (__ecma262_SameValueZero(keys[i], key)) {
       vals[i] = value;
       return _this;
     }
@@ -54,7 +54,7 @@ export const __Map_prototype_delete = (_this: Map, key: any) => {
 
   const size: i32 = keys.length;
   for (let i: i32 = 0; i < size; i++) {
-    if (keys[i] === key) {
+    if (__ecma262_SameValueZero(keys[i], key)) {
       Porffor.array.fastRemove(keys, i, size);
       Porffor.array.fastRemove(vals, i, size);
       return true;

package/compiler/builtins/number.ts

@@ -687,7 +687,6 @@ export const parseInt = (input: any, radix: any): f64 => {
 export const __Number_parseInt = (input: any, radix: any): f64 => parseInt(input, radix);
 
 export const parseFloat = (input: any): f64 => {
-  // todo: handle exponents
   input = ecma262.ToString(input).trim();
 
   let n: f64 = NaN;
@@ -740,6 +739,18 @@ export const parseFloat = (input: any): f64 => {
     } else if (chr == 46) { // .
       if (dec) break;
       dec = 1;
+    } else if (chr == 101 || chr == 69) { // e or E
+      if (Number.isNaN(n)) break; // No mantissa before exponent
+
+      const exp: f64 = __Porffor_parseExp(input, i, len, false);
+      if (!Number.isNaN(exp)) {
+        if (exp < 0) {
+          n = n / (10 ** -exp);
+        } else {
+          n = n * (10 ** exp);
+        }
+      }
+      break;
     } else {
       break;
     }

package/compiler/builtins/object.ts

@@ -28,9 +28,12 @@ export const __Object_keys = (obj: any): any[] => {
     for (; ptr < endPtr; ptr += 18) {
       if (!Porffor.object.isEnumerable(ptr)) continue;
 
+      // if key is a symbol skip it
+      const rawKey: i32 = Porffor.wasm.i32.load(ptr, 0, 4);
+      if ((rawKey >>> 30) == 3) continue;
+
       let key: any;
       Porffor.wasm`local raw i32
-local msb i32
 local.get ${ptr}
 i32.to_u
 i32.load 0 4
@@ -39,14 +42,8 @@ local.set raw
 local.get raw
 i32.const 30
 i32.shr_u
-local.tee msb
 if 127
-  i32.const 5 ;; symbol
   i32.const 67 ;; string
-  local.get msb
-  i32.const 3
-  i32.eq
-  select
   local.set ${key+1}
 
   local.get raw
@@ -84,6 +81,10 @@ export const __Object_values = (obj: any): any[] => {
       const tail: i32 = Porffor.wasm.i32.load16_u(ptr, 0, 16);
       if (!(tail & 0b0100)) continue; // not enumerable
 
+      // if key is a symbol skip it
+      const rawKey: i32 = Porffor.wasm.i32.load(ptr, 0, 4);
+      if ((rawKey >>> 30) == 3) continue;
+
       if (tail & 0b0001) {
         // accessor
         const get: Function = Porffor.object.accessorGet(ptr);
@@ -205,14 +206,67 @@ export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: a
 export const __Object_assign = (target: any, ...sources: any[]): any => {
   if (target == null) throw new TypeError('Argument is nullish, expected object');
 
-  for (const x of sources) {
-    // todo: switch to for..in once it supports non-pure-object
-    const keys: any[] = __Object_keys(x);
-    const vals: any[] = __Object_values(x);
+  for (let src of sources) {
+    if (src == null) continue;
 
-    const len: i32 = keys.length;
-    for (let i: i32 = 0; i < len; i++) {
-      target[keys[i]] = vals[i];
+    
+    src = __Porffor_object_underlying(src);
+    if (Porffor.type(src) == Porffor.TYPES.object) {
+      let ptr: i32 = Porffor.wasm`local.get ${src}` + 8;
+      const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(src, 0, 0) * 18;
+
+      for (; ptr < endPtr; ptr += 18) {
+        const tail: i32 = Porffor.wasm.i32.load16_u(ptr, 0, 16);
+        if (!(tail & 0b0100)) continue; // not enumerable
+
+        let key: any;
+        Porffor.wasm`local raw i32
+local msb i32
+local.get ${ptr}
+i32.to_u
+i32.load 0 4
+local.set raw
+
+local.get raw
+i32.const 30
+i32.shr_u
+local.tee msb
+if 127
+  i32.const 5 ;; symbol
+  i32.const 67 ;; string
+  local.get msb
+  i32.const 3
+  i32.eq
+  select
+  local.set ${key+1}
+
+  local.get raw
+  i32.const 1073741823
+  i32.and ;; unset 2 MSBs
+else
+  i32.const 195
+  local.set ${key+1}
+
+  local.get raw
+end
+i32.from_u
+local.set ${key}`;
+
+        let value: any;
+        if (tail & 0b0001) {
+          // accessor - call getter
+          const get: Function = Porffor.object.accessorGet(ptr);
+          if (Porffor.wasm`local.get ${get}` == 0) {
+            value = undefined;
+          } else {
+            value = get.call(src);
+          }
+        } else {
+          value = Porffor.object.readValue(ptr);
+        }
+
+        target[key] = value;
+      }
     }
   }
 

package/compiler/builtins/promise.ts

@@ -414,7 +414,6 @@ export const __Promise_allSettled = (promises: any): Promise => {
 };
 
 export const __Promise_any = (promises: any): Promise => {
-  // todo: use new AggregateError(_allOut, msg) instead of new AggregateError(msg) when supported
   _allPromises = promises;
 
   return new Promise((res, rej) => {
@@ -430,7 +429,7 @@ export const __Promise_any = (promises: any): Promise => {
         x.then(r => {
           _allRes(r);
         }, r => {
-          if (Porffor.array.fastPush(_allOut, r) == _allLen) _allRes(new AggregateError());
+          if (Porffor.array.fastPush(_allOut, r) == _allLen) _allRes(new AggregateError(_allOut));
         });
       } else {
         return _allRes(x);
@@ -439,7 +438,7 @@ export const __Promise_any = (promises: any): Promise => {
 
     if (_allLen == 0) {
       // empty iterable: immediately reject
-      _allRej(new AggregateError());
+      _allRej(new AggregateError(_allOut));
     }
   });
 };
@@ -487,4 +486,4 @@ export const __Porffor_promise_await = (value: any): any => {
 
   // rejected
   throw result;
-};
+};

package/compiler/builtins/set.ts

@@ -24,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 ((_this as any[])[i] === value) return true;
+    if (__ecma262_SameValueZero((_this as any[])[i], value)) return true;
   }
 
   return false;
@@ -35,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 ((_this as any[])[i] === value) return _this;
+    if (__ecma262_SameValueZero((_this as any[])[i], value)) return _this;
   }
 
   // not, add it
@@ -52,7 +52,7 @@ export const __Set_prototype_delete = (_this: Set, value: any) => {
   // check if already in set
   const size: number = Porffor.wasm.i32.load(_this, 0, 0);
   for (let i: number = 0; i < size; i++) {
-    if ((_this as any[])[i] === value) {
+    if (__ecma262_SameValueZero((_this as any[])[i], value)) {
       // found, delete
       Porffor.array.fastRemove(_this, i, size);
       return true;

package/compiler/builtins/stringtonumber.ts

@@ -1,3 +1,44 @@
+// Parse exponent part after 'e' or 'E'
+// Returns the exponent value (can be negative), or NaN on failure
+// strict: if true, returns NaN on any non-digit char; if false, stops at non-digit
+export const __Porffor_parseExp = (str: unknown, i: i32, len: i32, strict: boolean): f64 => {
+  let expNeg: boolean = false;
+  let exp: i32 = 0;
+  let hasDigit: boolean = false;
+
+  // Check for +/- after E
+  if (i < len) {
+    const sign: i32 = str.charCodeAt(i);
+    if (sign == 43) { // +
+      i++;
+    } else if (sign == 45) { // -
+      expNeg = true;
+      i++;
+    }
+  }
+
+  // Must have at least one digit
+  if (strict && i >= len) return NaN;
+
+  // Parse exponent digits
+  while (i < len) {
+    const chr: i32 = str.charCodeAt(i);
+    if (chr >= 48 && chr <= 57) { // 0-9
+      exp = (exp * 10) + chr - 48;
+      hasDigit = true;
+      i++;
+    } else {
+      if (strict) return NaN;
+      break;
+    }
+  }
+
+  if (!hasDigit) return NaN;
+
+  if (expNeg) return -exp;
+  return exp;
+};
+
 export const __Porffor_stn_int = (str: unknown, radix: i32, i: i32): f64 => {
   let nMax: i32 = 58;
   if (radix < 10) nMax = 48 + radix;
@@ -46,6 +87,11 @@ export const __Porffor_stn_float = (str: unknown, i: i32): f64 => {
     } else if (chr == 46) { // .
       if (dec) return NaN;
       dec = 1;
+    } else if (chr == 69 || chr == 101) { // E or e
+      const exp: f64 = __Porffor_parseExp(str, i, len, true);
+      if (Number.isNaN(exp)) return NaN;
+      if (exp < 0) return n / (10 ** -exp);
+      return n * (10 ** exp);
     } else {
       return NaN;
     }
@@ -116,7 +162,6 @@ export const __ecma262_StringToNumber = (str: unknown): number => {
     return NaN;
   }
 
-  // todo: handle exponents
   const n: f64 = __Porffor_stn_float(str, i);
 
   if (negative) return -n;