porffor 0.60.14 → 0.60.16

package/compiler/builtins/date.ts

@@ -347,7 +347,7 @@ export const __ecma262_WeekDayName = (tv: number): bytestring => {
   const lut: bytestring = 'SunMonTueWedThuFriSat';
   const weekday: number = __ecma262_WeekDay(tv);
 
-  let out: bytestring = Porffor.allocateBytes(7);
+  let out: bytestring = Porffor.allocateBytes(8);
   out.length = 3;
 
   let outPtr: number = Porffor.wasm`local.get ${out}`;
@@ -365,7 +365,7 @@ export const __ecma262_MonthName = (tv: number): bytestring => {
   const lut: bytestring = 'JanFebMarAprMayJunJulAugSepOctNovDec';
   const month: number = __ecma262_MonthFromTime(tv);
 
-  let out: bytestring = Porffor.allocateBytes(7);
+  let out: bytestring = Porffor.allocateBytes(8);
   out.length = 3;
 
   let outPtr: number = Porffor.wasm`local.get ${out}`;
@@ -1472,7 +1472,7 @@ export const __Porffor_bytestring_appendPadNum = (str: bytestring, num: number,
 export const __ecma262_ToUTCDTSF = (t: number): bytestring => {
   const year: number = __ecma262_YearFromTime(t);
 
-  let out: bytestring = Porffor.allocateBytes(32);
+  let out: bytestring = Porffor.allocateBytes(64);
   if (Porffor.fastOr(year < 0, year >= 10000)) {
     // extended year format
     // sign
@@ -1565,7 +1565,7 @@ export const __ecma262_TimeString = (tv: number): bytestring => {
   const second: number = __ecma262_SecFromTime(tv);
 
   // 4. Return the string-concatenation of hour, ":", minute, ":", second, the code unit 0x0020 (SPACE), and "GMT".
-  let out: bytestring = Porffor.allocateBytes(16);
+  let out: bytestring = Porffor.allocateBytes(64);
   __Porffor_bytestring_appendPadNum(out, hour, 2);
   __Porffor_bytestring_appendChar(out, 58); // ':'
 
@@ -1601,7 +1601,7 @@ export const __ecma262_DateString = (tv: number): bytestring => {
   // 5. If yv is +0𝔽 or yv > +0𝔽, let yearSign be the empty String; otherwise, let yearSign be "-".
   // 6. Let paddedYear be ToZeroPaddedDecimalString(abs(ℝ(yv)), 4).
   // 7. Return the string-concatenation of weekday, the code unit 0x0020 (SPACE), month, the code unit 0x0020 (SPACE), day, the code unit 0x0020 (SPACE), yearSign, and paddedYear.
-  let out: bytestring = Porffor.allocateBytes(20);
+  let out: bytestring = Porffor.allocateBytes(64);
 
   // weekday
   __Porffor_bytestring_appendStr(out, weekday);
@@ -1638,7 +1638,7 @@ export const __ecma262_ToDateString = (tv: number) => {
   const t: number = __ecma262_LocalTime(tv);
 
   // 3. Return the string-concatenation of DateString(t), the code unit 0x0020 (SPACE), TimeString(t), and TimeZoneString(tv).
-  const out: bytestring = Porffor.allocateBytes(44);
+  const out: bytestring = Porffor.allocateBytes(64);
   __Porffor_bytestring_appendStr(out, __ecma262_DateString(t));
   __Porffor_bytestring_appendChar(out, 32);
 
@@ -1675,7 +1675,7 @@ export const __Date_prototype_toTimeString = (_this: any) => {
   const t: number = __ecma262_LocalTime(tv);
 
   // 6. Return the string-concatenation of TimeString(t) and TimeZoneString(tv).
-  const out: bytestring = Porffor.allocateBytes(27);
+  const out: bytestring = Porffor.allocateBytes(64);
   __Porffor_bytestring_appendStr(out, __ecma262_TimeString(t));
   __Porffor_bytestring_appendStr(out, __ecma262_TimeZoneString(tv));
   return out;
@@ -1728,7 +1728,7 @@ export const __Date_prototype_toUTCString = (_this: any) => {
   // 11. Return the string-concatenation of weekday, ",", the code unit 0x0020 (SPACE),
   // day, the code unit 0x0020 (SPACE), month, the code unit 0x0020 (SPACE),
   // yearSign, paddedYear, the code unit 0x0020 (SPACE), and TimeString(tv).
-  const out: bytestring = Porffor.allocateBytes(34);
+  const out: bytestring = Porffor.allocateBytes(64);
 
   // weekday
   __Porffor_bytestring_appendStr(out, weekday);
@@ -1781,7 +1781,7 @@ export const __Date_prototype_valueOf = (_this: any) => {
 
 // 21.4.2.1 Date (...values)
 // https://tc39.es/ecma262/multipage/numbers-and-dates.html#sec-date
-export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown, v4: unknown, v5: unknown, v6: unknown): bytestring|Date {
+export const Date = function (...values: any[]): bytestring|Date {
   // 1. If NewTarget is undefined, then
   if (!new.target) {
     // a. Let now be the time value (UTC) identifying the current time.
@@ -1789,18 +1789,8 @@ export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown
     return __ecma262_ToDateString(__Date_now());
   }
 
-  // todo: passing undefined to params should not act like no arg was passed
-
   // 2. Let numberOfArgs be the number of elements in values.
-  // sorry.
-  const numberOfArgs: i32 =
-    (Porffor.type(v0) != Porffor.TYPES.undefined) +
-    (Porffor.type(v1) != Porffor.TYPES.undefined) +
-    (Porffor.type(v2) != Porffor.TYPES.undefined) +
-    (Porffor.type(v3) != Porffor.TYPES.undefined) +
-    (Porffor.type(v4) != Porffor.TYPES.undefined) +
-    (Porffor.type(v5) != Porffor.TYPES.undefined) +
-    (Porffor.type(v6) != Porffor.TYPES.undefined);
+  const numberOfArgs: i32 = values.length;
 
   let dv: number = 0;
 
@@ -1809,19 +1799,20 @@ export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown
     // a. Let dv be the time value (UTC) identifying the current time.
     dv = __Date_now();
   } else if (numberOfArgs == 1) {
-    // 4. Else if numberOfArgs = 1, the n
+    // 4. Else if numberOfArgs = 1, then
     // a. Let value be values[0].
-    const value: any = v0;
+    const value: any = values[0];
     let tv: number = 0;
 
     // b. If value is an Object and value has a [[DateValue]] internal slot, then
-    if (Porffor.type(v0) == Porffor.TYPES.date) {
+    if (Porffor.type(value) == Porffor.TYPES.date) {
       // i. Let tv be value.[[DateValue]].
       tv = __Porffor_date_read(value);
     } else {
       // c. Else,
+      // i. Let v be ? ToPrimitive(value).
       // ii. If v is a String, then
-      if ((Porffor.type(v0) | 0b10000000) == Porffor.TYPES.bytestring) {
+      if ((Porffor.type(value) | 0b10000000) == 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).
@@ -1840,30 +1831,30 @@ export const Date = function (v0: unknown, v1: unknown, v2: unknown, v3: unknown
     // a. Assert: numberOfArgs ≥ 2.
 
     // b. Let y be ? ToNumber(values[0]).
-    const y: number = ecma262.ToNumber(v0);
+    const y: number = ecma262.ToNumber(values[0]);
 
     // c. Let m be ? ToNumber(values[1]).
-    const m: number = ecma262.ToNumber(v1);
+    const m: number = ecma262.ToNumber(values[1]);
 
     // d. If numberOfArgs > 2, let dt be ? ToNumber(values[2]); else let dt be 1𝔽.
     let dt: number = 1;
-    if (numberOfArgs > 2) dt = ecma262.ToNumber(v2);
+    if (numberOfArgs > 2) dt = ecma262.ToNumber(values[2]);
 
     // e. If numberOfArgs > 3, let h be ? ToNumber(values[3]); else let h be +0𝔽.
     let h: number = 0;
-    if (numberOfArgs > 3) h = ecma262.ToNumber(v3);
+    if (numberOfArgs > 3) h = ecma262.ToNumber(values[3]);
 
     // f. If numberOfArgs > 4, let min be ? ToNumber(values[4]); else let min be +0𝔽.
     let min: number = 0;
-    if (numberOfArgs > 4) min = ecma262.ToNumber(v4);
+    if (numberOfArgs > 4) min = ecma262.ToNumber(values[4]);
 
     // g. If numberOfArgs > 5, let s be ? ToNumber(values[5]); else let s be +0𝔽.
     let s: number = 0;
-    if (numberOfArgs > 5) s = ecma262.ToNumber(v5);
+    if (numberOfArgs > 5) s = ecma262.ToNumber(values[5]);
 
     // h. If numberOfArgs > 6, let milli be ? ToNumber(values[6]); else let milli be +0𝔽.
     let milli: number = 0;
-    if (numberOfArgs > 6) milli = ecma262.ToNumber(v6);
+    if (numberOfArgs > 6) milli = ecma262.ToNumber(values[6]);
 
     // i. Let yr be MakeFullYear(y).
     const yr: number = __ecma262_MakeFullYear(y);

package/compiler/builtins/object.ts

@@ -81,22 +81,22 @@ export const __Object_values = (obj: any): any[] => {
 
     let i: i32 = 0;
     for (; ptr < endPtr; ptr += 18) {
-      if (!Porffor.object.isEnumerable(ptr)) continue;
-
-      let val: any;
-      Porffor.wasm`local ptr32 i32
-local.get ${ptr}
-i32.to_u
-local.tee ptr32
-
-f64.load 0 8
-local.set ${val}
-
-local.get ptr32
-i32.load8_u 0 17
-local.set ${val+1}`;
+      const tail: i32 = Porffor.wasm.i32.load16_u(ptr, 0, 16);
+      if (!(tail & 0b0100)) continue; // not enumerable
+
+      if (tail & 0b0001) {
+        // accessor
+        const get: Function = Porffor.object.accessorGet(ptr);
+        if (Porffor.wasm`local.get ${get}` == 0) {
+          out[i++] = undefined;
+          continue;
+        }
+
+        out[i++] = get.call(obj);
+        continue;
+      }
 
-      out[i++] = val;
+      out[i++] = Porffor.object.readValue(ptr);
     }
 
     out.length = i;
@@ -731,7 +731,6 @@ export const __Porffor_object_spread = (dst: object, src: any): object => {
 
   const len: i32 = keys.length;
   for (let i: i32 = 0; i < len; i++) {
-    // target[keys[i]] = vals[i];
     Porffor.object.expr.init(dst, keys[i], vals[i]);
   }