porffor 0.61.7 → 0.61.9

package/compiler/builtins/array.ts

@@ -64,8 +64,9 @@ export const __Array_from = (arg: any, mapFn: any, thisArg: any = undefined): an
     return out;
   }
 
-  if (Porffor.type(arg) == Porffor.TYPES.object) {
-    let len: i32 = ecma262.ToIntegerOrInfinity((arg as object)['length']);
+  if (__Porffor_object_isObject(arg)) {
+    const obj: object = Porffor.type(arg) == Porffor.TYPES.object ? arg : __Porffor_object_underlying(arg);
+    let len: i32 = ecma262.ToIntegerOrInfinity(obj['length']);
     if (len > 4294967295) throw new RangeError('Invalid array length');
     if (len < 0) len = 0;
 
@@ -73,11 +74,11 @@ export const __Array_from = (arg: any, mapFn: any, thisArg: any = undefined): an
       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);
+        out[i] = mapFn.call(thisArg, obj[i], i);
       }
     } else {
       for (let i: i32 = 0; i < len; i++) {
-        out[i] = (arg as object)[i];
+        out[i] = obj[i];
       }
     }
 
@@ -447,7 +448,7 @@ export const __Array_prototype_with = (_this: any[], _index: any, value: any) =>
     }
   }
 
-  if (index > len) {
+  if (index >= len) {
     throw new RangeError('Invalid index');
   }
 
@@ -528,7 +529,7 @@ export const __Array_prototype_reverse = (_this: any[]) => {
   let end: i32 = len - 1;
 
   while (start < end) {
-    const tmp: i32 = _this[start];
+    const tmp: any = _this[start];
     _this[start++] = _this[end];
     _this[end--] = tmp;
   }
@@ -739,6 +740,8 @@ export const __Array_prototype_sort = (_this: any[], callbackFn: any) => {
     };
   }
 
+  if (Porffor.type(callbackFn) != Porffor.TYPES.function) throw new TypeError('Callback must be a function');
+
   // insertion sort, i guess
   const len: i32 = _this.length;
   for (let i: i32 = 0; i < len; i++) {

package/compiler/builtins/function.ts

@@ -27,4 +27,28 @@ export const __Function_prototype_apply = (_this: Function, thisArg: any, argsAr
 export const __Function_prototype_bind = (_this: Function, thisArg: any, argsArray: any) => {
   // todo: no good way to bind without dynamic functions or closure yet, just return function
   return _this;
+};
+
+
+export const __Porffor_generateArgumentsObject = (argc: i32, hasRest: boolean, ...args: any[]) => {
+  let obj: object = {}, i: i32 = 0, limit: i32 = args.length;
+  if (hasRest) limit--;
+  limit = Math.min(argc, limit);
+
+  while (i < limit) {
+    obj[i] = args[i];
+    i++;
+  }
+
+  if (hasRest) {
+    const rest: any[] = args[limit];
+    const len: i32 = rest.length;
+    for (let j: i32 = 0; j < len; j++) {
+      obj[i] = rest[j];
+      i++;
+    }
+  }
+
+  obj.length = i;
+  return obj;
 };