porffor 0.39.1 → 0.39.3

package/compiler/builtins/__internal_object.ts

@@ -6,7 +6,7 @@ export const __Porffor_object_underlying = (obj: any): any => {
 
   if (Porffor.fastAnd(
     t >= Porffor.TYPES.error,
-    t <= Porffor.TYPES.urierror
+    t <= Porffor.TYPES.__porffor_todoerror
   )) {
     const remap: object = obj;
     return remap;

package/compiler/builtins/array.ts

@@ -557,9 +557,44 @@ export const __Array_prototype_reduceRight = (_this: any[], callbackFn: any, ini
   return acc;
 };
 
+// string less than <
+export const __Porffor_strlt = (a: string|bytestring, b: string|bytestring) => {
+  const maxLength: i32 = Math.max(a.length, b.length);
+  for (let i: i32 = 0; i < maxLength; i++) {
+    const ac: i32 = a.charCodeAt(i);
+    const bc: i32 = b.charCodeAt(i);
+
+    if (ac < bc) return true;
+  }
+
+  return false;
+};
+
 // @porf-typed-array
 export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
-  // todo: default callbackFn
+  if (callbackFn === undefined) {
+    // default callbackFn, convert to strings and sort by char code
+    callbackFn = (x: any, y: any) => {
+      // 23.1.3.30.2 CompareArrayElements (x, y, comparefn)
+      // https://tc39.es/ecma262/#sec-comparearrayelements
+      // 5. Let xString be ? ToString(x).
+      const xString: any = ecma262.ToString(x);
+
+      // 6. Let yString be ? ToString(y).
+      const yString: any = ecma262.ToString(y);
+
+      // 7. Let xSmaller be ! IsLessThan(xString, yString, true).
+      // 8. If xSmaller is true, return -1𝔽.
+      if (__Porffor_strlt(xString, yString)) return -1;
+
+      // 9. Let ySmaller be ! IsLessThan(yString, xString, true).
+      // 10. If ySmaller is true, return 1𝔽.
+      if (__Porffor_strlt(yString, xString)) return 1;
+
+      // 11. Return +0𝔽.
+      return 0;
+    };
+  }
 
   // insertion sort, i guess
   const len: i32 = _this.length;
@@ -584,8 +619,7 @@ export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
         else {
           // 4. If comparefn is not undefined, then
           // a. Let v be ? ToNumber(? Call(comparefn, undefined, « x, y »)).
-          // perf: unneeded as we just check >= 0
-          // v = Number(callbackFn(x, y));
+          // perf: ToNumber unneeded as we just check >= 0
           v = callbackFn(x, y);
 
           // b. If v is NaN, return +0𝔽.

package/compiler/builtins/error.js

@@ -41,8 +41,10 @@ export const __${name.startsWith('__') ? name.slice(2) : name}_prototype_toStrin
   error('EvalError');
   error('URIError');
 
-  error('__Porffor_TodoError');
   error('Test262Error');
+  error('__Porffor_TodoError');
+
+  out += `\nexport const __Test262Error_thrower = message => { throw new Test262Error(message); };`;
 
   return out;
 };

package/compiler/builtins/promise.ts

@@ -94,7 +94,7 @@ export const __ecma262_RejectPromise = (promise: any[], reason: any): void => {
 
 export const __Porffor_promise_noop = () => {};
 
-export const __Porffor_promise_resolve = (promise: any, value: any): any => {
+export const __Porffor_promise_resolve = (value: any, promise: any): any => {
   // todo: if value is own promise, reject with typeerror
 
   if (__ecma262_IsPromise(value)) {
@@ -106,7 +106,7 @@ export const __Porffor_promise_resolve = (promise: any, value: any): any => {
   return undefined;
 };
 
-export const __Porffor_promise_reject = (promise: any, reason: any): any => {
+export const __Porffor_promise_reject = (reason: any, promise: any): any => {
   if (__ecma262_IsPromise(reason)) {
     // todo
   } else {
@@ -181,8 +181,8 @@ export const __Porffor_promise_runJobs = () => {
 
 // hack: cannot share scope so use a global
 let activePromise: any;
-export const __Porffor_promise_resolveActive = (value: any) => __Porffor_promise_resolve(activePromise, value);
-export const __Porffor_promise_rejectActive = (reason: any) => __Porffor_promise_reject(activePromise, reason);
+export const __Porffor_promise_resolveActive = (value: any) => __Porffor_promise_resolve(value, activePromise);
+export const __Porffor_promise_rejectActive = (reason: any) => __Porffor_promise_reject(reason, activePromise);
 
 export const Promise = function (executor: any): void {
   if (!new.target) throw new TypeError("Constructor Promise requires 'new'");
@@ -191,7 +191,13 @@ export const Promise = function (executor: any): void {
   const obj: any[] = __Porffor_promise_create();
 
   activePromise = obj;
-  executor(__Porffor_promise_resolveActive, __Porffor_promise_rejectActive);
+
+  try {
+    executor(__Porffor_promise_resolveActive, __Porffor_promise_rejectActive);
+  } catch (e) {
+    // executor threw, reject promise
+    __ecma262_RejectPromise(obj, e);
+  }
 
   const pro: Promise = obj;
   return pro;
@@ -200,7 +206,7 @@ export const Promise = function (executor: any): void {
 export const __Promise_resolve = (value: any): Promise => {
   const obj: any[] = __Porffor_promise_create();
 
-  __Porffor_promise_resolve(obj, value);
+  __Porffor_promise_resolve(value, obj);
 
   const pro: Promise = obj;
   return pro;
@@ -209,7 +215,7 @@ export const __Promise_resolve = (value: any): Promise => {
 export const __Promise_reject = (reason: any): Promise => {
   const obj: any[] = __Porffor_promise_create();
 
-  __Porffor_promise_reject(obj, reason);
+  __Porffor_promise_reject(reason, obj);
 
   const pro: Promise = obj;
   return pro;
@@ -431,6 +437,5 @@ export const __Porffor_promise_await = (value: any) => {
   if (state == 1) return result;
 
   // rejected
-  // todo: throw result instead of fixed error here
-  throw Error('Uncaught await promise rejection');
+  throw result;
 };

package/compiler/builtins/reflect.ts

@@ -88,6 +88,7 @@ export const __Reflect_ownKeys = (target: any) => {
 
   const out: any[] = Porffor.allocate();
 
+  target = __Porffor_object_underlying(target);
   const t: i32 = Porffor.rawType(target);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${target}` + 5;
@@ -132,25 +133,6 @@ local.set ${key}`;
     }
 
     out.length = i;
-  } else {
-    if (Porffor.fastOr(
-      t == Porffor.TYPES.array,
-      t == Porffor.TYPES.bytestring,
-      t == Porffor.TYPES.string
-    )) {
-      const len: i32 = obj.length;
-      out.length = len;
-
-      for (let i: i32 = 0; i < len; i++) {
-        out[i] = __Number_prototype_toString(i);
-      }
-    }
-
-    target = __Porffor_object_underlying(target);
-    if (Porffor.rawType(target) == Porffor.TYPES.object) {
-      const objKeys: any[] = __Reflect_ownKeys(target);
-      for (const x of objKeys) Porffor.array.fastPush(out, x);
-    }
   }
 
   return out;

package/compiler/builtins/string.ts

@@ -1609,4 +1609,4 @@ export const __String_prototype_valueOf = (_this: string) => {
 export const __ByteString_prototype_valueOf = (_this: bytestring) => {
   // 1. Return ? ThisStringValue(this value).
   return _this;
-};
+};