porffor 0.36.1 → 0.36.3

package/compiler/builtins/_internal_object.ts

@@ -326,7 +326,6 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
 
       // no setter, return early
       if (Porffor.wasm`local.get ${set}` == 0) {
-        // todo: throw in strict mode?
         return value;
       }
 
@@ -375,6 +374,92 @@ export const __Porffor_object_set = (obj: any, key: any, value: any): any => {
   return value;
 };
 
+export const __Porffor_object_setStrict = (obj: any, key: any, value: any): any => {
+  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot set property of null');
+
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
+    obj = __Porffor_object_getObject(obj);
+    if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return value;
+  }
+
+  let entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  let flags: i32;
+  if (entryPtr == -1) {
+    // add new entry
+    // check if object is inextensible
+    if (__Porffor_object_isInextensible(obj)) {
+      throw new TypeError('Cannot add property to inextensible object');
+    }
+
+    // bump size +1
+    const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
+    Porffor.wasm.i32.store(obj, size + 1, 0, 0);
+
+    // entryPtr = current end of object
+    entryPtr = Porffor.wasm`local.get ${obj}` + 5 + size * 14;
+
+    __Porffor_object_writeKey(entryPtr, key);
+
+    // flags = writable, enumerable, configurable, not accessor
+    flags = 0b1110;
+  } else {
+    // existing entry, modify it
+    const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
+
+    if (tail & 0b0001) {
+      // accessor descriptor
+      const set: Function = __Porffor_object_accessorSet(entryPtr);
+
+      // no setter, return early
+      if (Porffor.wasm`local.get ${set}` == 0) {
+        throw new TypeError('Cannot set property with no setter of object');
+      }
+
+      const funcFlags: i32 = __Porffor_funcLut_flags(set);
+      if (funcFlags & 0b10) {
+        // constructor func, add new.target, this args
+        Porffor.wasm`
+  f64.const 0
+  i32.const 0
+  local.get ${obj}
+  f64.convert_i32_u
+  i32.const 7
+  local.get ${value}
+  local.get ${value+1}
+  local.get ${set}
+  call_indirect 3 0`;
+      } else {
+        Porffor.wasm`
+  local.get ${value}
+  local.get ${value+1}
+  local.get ${set}
+  call_indirect 1 0`;
+      }
+
+      return value;
+    }
+
+    // data descriptor
+    if (!(tail & 0b1000)) {
+      // not writable, return now
+      throw new TypeError('Cannot modify read-only property of object');
+    }
+
+    // flags = same flags as before
+    flags = tail & 0xff;
+  }
+
+  // write new value value (lol)
+  Porffor.wasm.f64.store(entryPtr, value, 0, 4);
+
+  // write new tail (value type + flags)
+  Porffor.wasm.i32.store16(entryPtr,
+    flags + (Porffor.wasm`local.get ${value+1}` << 8),
+    0, 12);
+
+  return value;
+};
+
 export const __Porffor_object_define = (obj: any, key: any, value: any, flags: i32): void => {
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) {
     obj = __Porffor_object_getObject(obj);
@@ -477,7 +562,6 @@ export const __Porffor_object_delete = (obj: any, key: any): boolean => {
   const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
   if (!(tail & 0b0010)) {
     // not configurable
-    // todo: throw in strict mode
     return false;
   }
 
@@ -511,6 +595,71 @@ memory.copy 0 0`;
   return true;
 };
 
+export const __Porffor_object_deleteStrict = (obj: any, key: any): boolean => {
+  if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot delete property of null');
+
+  if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.function) {
+    const tmp1: bytestring = 'name';
+    if (key == tmp1) {
+      __Porffor_funcLut_deleteName(obj);
+      return true;
+    }
+
+    const tmp2: bytestring = 'length';
+    if (key == tmp2) {
+      __Porffor_funcLut_deleteLength(obj);
+      return true;
+    }
+  }
+
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
+    // todo: support non-pure objects
+    return true;
+  }
+
+  const entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  if (entryPtr == -1) {
+    // not found, stop
+    return true;
+  }
+
+  const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
+  if (!(tail & 0b0010)) {
+    // not configurable
+    throw new TypeError('Cannot delete non-configurable property of object');
+  }
+
+  const ind: i32 = (entryPtr - Porffor.wasm`local.get ${obj}`) / 14;
+
+  // decrement size
+  let size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
+  Porffor.wasm.i32.store(obj, --size, 0, 0);
+
+  if (size > ind) {
+    // offset all elements after by -1 ind
+    Porffor.wasm`
+;; dst = entryPtr
+local.get ${entryPtr}
+
+;; src = entryPtr + 14 (+ 1 entry)
+local.get ${entryPtr}
+i32.const 14
+i32.add
+
+;; size = (size - ind) * 14
+local.get ${size}
+local.get ${ind}
+i32.sub
+i32.const 14
+i32.mul
+
+memory.copy 0 0`;
+  }
+
+  return true;
+};
+
 
 export const __Porffor_object_isEnumerable = (entryPtr: i32): boolean => {
   const out: boolean = Porffor.wasm.i32.load8_u(entryPtr, 0, 12) & 0b0100;

package/compiler/builtins/object.ts

@@ -595,13 +595,11 @@ export const __Object_defineProperty = (target: any, prop: any, descriptor: any)
 
   let flags: i32 = 0b0000;
   if (accessor) flags |= 0b0001;
-  if (configurable) flags |= 0b0010;
-  if (enumerable) flags |= 0b0100;
-  if (writable) flags |= 0b1000;
+  if (!!configurable) flags |= 0b0010;
+  if (!!enumerable) flags |= 0b0100;
+  if (!!writable) flags |= 0b1000;
 
-  if (accessor) {
-    value = Porffor.object.packAccessor(get, set);
-  }
+  if (accessor) value = Porffor.object.packAccessor(get, set);
 
   Porffor.object.define(target, p, value, flags);
   return target;
@@ -680,6 +678,12 @@ export const __Object_prototype_isPrototypeOf = (_this: any, obj: any) => {
 
 
 export const __Object_prototype_toString = (_this: any) => {
+  if (Porffor.rawType(_this) == Porffor.TYPES.object) {
+    const obj: object = _this;
+    const ovr: any = obj.toString;
+    if (ovr != null && ovr !== __Object_prototype_toString) return ovr.call(_this);
+  }
+
   let out: bytestring = Porffor.allocate();
 
   // 1. If the this value is undefined, return "[object Undefined]".
@@ -704,10 +708,16 @@ export const __Object_prototype_toString = (_this: any) => {
   return out = '[object Object]';
 };
 
-export const __Object_prototype_toLocaleString = (_this: any) => __Object_prototype_toLocaleString(_this);
+export const __Object_prototype_toLocaleString = (_this: any) => __Object_prototype_toString(_this);
 
 export const __Object_prototype_valueOf = (_this: any) => {
   // todo: ToObject
+  if (Porffor.rawType(_this) == Porffor.TYPES.object) {
+    const obj: object = _this;
+    const ovr: any = obj.valueOf;
+    if (ovr != null && ovr !== __Object_prototype_valueOf) return ovr.call(_this);
+  }
+
   return _this;
 };
 

package/compiler/builtins/z_ecma262.ts

@@ -1,6 +1,30 @@
 // general widely used ecma262/spec functions
 import type {} from './porffor.d.ts';
 
+export const __ecma262_ToPrimitive_Number = (input: any): any => {
+  // todo: %Symbol.toPrimitive%
+
+  let value: any = input.valueOf?.();
+  if (value != null && !Porffor.object.isObjectOrNull(value)) return value;
+
+  value = input.toString?.();
+  if (value != null && !Porffor.object.isObjectOrNull(value)) return value;
+
+  throw new TypeError('Cannot convert an object to primitive');
+};
+
+export const __ecma262_ToPrimitive_String = (input: any): any => {
+  // todo: %Symbol.toPrimitive%
+
+  let value: any = input.toString?.();
+  if (value != null && !Porffor.object.isObjectOrNull(value)) return value;
+
+  value = input.valueOf?.();
+  if (value != null && !Porffor.object.isObjectOrNull(value)) return value;
+
+  throw new TypeError('Cannot convert an object to primitive');
+};
+
 // 7.1.4 ToNumber (argument)
 // https://tc39.es/ecma262/#sec-tonumber
 export const __ecma262_ToNumber = (argument: unknown): number => {
@@ -35,13 +59,11 @@ export const __ecma262_ToNumber = (argument: unknown): number => {
 
   // 7. Assert: argument is an Object.
   // 8. Let primValue be ? ToPrimitive(argument, number).
+  const primValue: any = __ecma262_ToPrimitive_Number(argument);
+
   // 9. Assert: primValue is not an Object.
   // 10. Return ? ToNumber(primValue).
-
-  // // todo: I doubt this is spec-compliant
-  // return __ecma262_ToNumber(argument.valueOf());
-
-  return NaN;
+  return __ecma262_ToNumber(primValue);
 };
 
 
@@ -128,26 +150,35 @@ 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);
+
   // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
+
   // 9. Assert: argument is an Object.
   // 10. Let primValue be ? ToPrimitive(argument, string).
+  const primValue: any = __ecma262_ToPrimitive_String(argument);
+
   // 11. Assert: primValue is not an Object.
   // 12. Return ? ToString(primValue).
-  return argument.toString();
+  return __ecma262_ToString(primValue);
 };
 
 // 7.1.19 ToPropertyKey (argument)
 // https://tc39.es/ecma262/#sec-topropertykey
 export const __ecma262_ToPropertyKey = (argument: any): any => {
   // 1. Let key be ? ToPrimitive(argument, string).
-  // argument = key
+  let key: any = argument;
+
+  // only run ToPrimitive if pure object for perf
+  if (Porffor.rawType(argument) == Porffor.TYPES.object && Porffor.wasm`local.get ${argument}` != 0)
+    key = __ecma262_ToPrimitive_String(argument);
 
   // 2. If key is a Symbol, then
-  if (Porffor.rawType(argument) == Porffor.TYPES.symbol) {
+  if (Porffor.rawType(key) == Porffor.TYPES.symbol) {
     // a. Return key.
-    return argument;
+    return key;
   }
 
   // 3. Return ! ToString(key).
-  return __ecma262_ToString(argument);
+  return __ecma262_ToString(key);
 };

package/compiler/builtins_objects.js

@@ -16,11 +16,9 @@ export default function({ builtinFuncs }, Prefs) {
     builtinFuncs['#get_' + name] = {
       params: [],
       locals: [],
-      globals: [ Valtype.i32 ],
-      globalNames: [ '#getptr_' + name ],
       returns: [ Valtype.i32 ],
       returnType: TYPES.object,
-      wasm: (scope, { allocPage, makeString, generate, getNodeType, builtin }) => {
+      wasm: (scope, { allocPage, makeString, generate, getNodeType, builtin, glbl }) => {
         if (globalThis.precompile) return [ [ 'get object', name ] ];
 
         // todo/perf: precompute bytes here instead of calling real funcs if we really care about perf later
@@ -32,17 +30,18 @@ export default function({ builtinFuncs }, Prefs) {
           ptr = allocPage(scope, `builtin object: ${name}`);
         }
 
+        const getPtr = glbl(Opcodes.global_get, `getptr_${name}`, Valtype.i32)[0];
         const out = [
           // check if already made/cached
-          [ Opcodes.global_get, 0 ],
+          getPtr,
           [ Opcodes.if, Blocktype.void ],
-            [ Opcodes.global_get, 0 ],
+            getPtr,
             [ Opcodes.return ],
           [ Opcodes.end ],
 
           // set cache & ptr for use
           ...number(ptr, Valtype.i32),
-          [ Opcodes.global_set, 0 ],
+          glbl(Opcodes.global_set, `getptr_${name}`, Valtype.i32)[0]
         ];
 
         for (const x in props) {
@@ -62,7 +61,7 @@ export default function({ builtinFuncs }, Prefs) {
           if (this[prefix + x]?.type === TYPES.object && this[prefix + x] !== this.null) value = { type: 'ObjectExpression', properties: [] };
 
           out.push(
-            [ Opcodes.global_get, 0 ],
+            getPtr,
             ...number(existingFunc ? TYPES.function : TYPES.object, Valtype.i32),
 
             ...makeString(scope, x, false, `#builtin_object_${name}_${x}`),
@@ -75,16 +74,14 @@ export default function({ builtinFuncs }, Prefs) {
             ...number(flags, Valtype.i32),
             ...number(TYPES.number, Valtype.i32),
 
-            [ Opcodes.call, builtin('__Porffor_object_define') ],
+            [ Opcodes.call, builtin('__Porffor_object_expr_initWithFlags') ],
             [ Opcodes.drop ],
             [ Opcodes.drop ]
           );
         }
 
-        out.push(
-          // return ptr
-          [ Opcodes.global_get, 0 ]
-        );
+        // return ptr
+        out.push(getPtr);
         return out;
       }
     };