porffor 0.41.5 → 0.41.6

package/compiler/builtins/__internal_object.ts

@@ -31,14 +31,20 @@ export const __Porffor_object_underlying = (obj: any): any => {
           const key2: bytestring = 'constructor';
           __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
         }
+
+        const key3: bytestring = 'name';
+        __Porffor_object_expr_initWithFlags(underlying, key3, __Porffor_funcLut_name(obj), 0b0010);
+
+        const key4: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key4, __Porffor_funcLut_length(obj), 0b0010);
       }
 
       if (t == Porffor.TYPES.array) {
         const arr: any[] = obj;
         const len: i32 = arr.length;
 
-        const key3: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key3, len, 0b1000);
+        const key5: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key5, len, 0b1000);
 
         // todo: this should somehow be kept in sync?
         for (let i: i32 = 0; i < len; i++) {
@@ -50,8 +56,8 @@ export const __Porffor_object_underlying = (obj: any): any => {
         const str: string = obj;
         const len: i32 = str.length;
 
-        const key4: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key4, len, 0b0000);
+        const key6: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key6, len, 0b0000);
 
         for (let i: i32 = 0; i < len; i++) {
           __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), str[i], 0b0100);
@@ -64,8 +70,8 @@ export const __Porffor_object_underlying = (obj: any): any => {
         const str: bytestring = obj;
         const len: i32 = str.length;
 
-        const key5: bytestring = 'length';
-        __Porffor_object_expr_initWithFlags(underlying, key5, len, 0b0000);
+        const key7: bytestring = 'length';
+        __Porffor_object_expr_initWithFlags(underlying, key7, len, 0b0000);
 
         for (let i: i32 = 0; i < len; i++) {
           __Porffor_object_expr_initWithFlags(underlying, __Number_prototype_toString(i), str[i], 0b0100);

package/compiler/builtins/_internal_object.ts

@@ -135,34 +135,30 @@ export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
   const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
   const endPtr: i32 = ptr + size * 14;
 
-  if (targetType == Porffor.TYPES.bytestring) {
-    const targetStr: bytestring = target;
-    for (; ptr < endPtr; ptr += 14) {
-      const keyRaw: i32 = Porffor.wasm.i32.load(ptr, 0, 0);
-      if (keyRaw == 0) break; // ran out of keys
-      if (keyRaw >>> 31) continue; // MSB 1 set, not a bytestring
-
-      const keyStr: bytestring = keyRaw;
-      if (keyStr == targetStr) return ptr;
-    }
-  } else if (targetType == Porffor.TYPES.string) {
-    const targetStr: string = target;
+  if (targetType == Porffor.TYPES.symbol) {
+    const targetSym: symbol = target;
     for (; ptr < endPtr; ptr += 14) {
       const keyRaw: i32 = Porffor.wasm.i32.load(ptr, 0, 0);
       if (keyRaw == 0) break; // ran out of keys
-      if (keyRaw >>> 30 == 2) { // MSB 1 set and 2 unset, regular string type
-        const keyStr: string = keyRaw & 0x7FFFFFFF; // unset MSB
-        if (keyStr == targetStr) return ptr;
+      if (keyRaw >>> 30 == 3) { // MSB 1 and 2 set, symbol
+        const keySym: symbol = keyRaw & 0x3FFFFFFF; // unset MSB
+        if (keySym == targetSym) return ptr;
       }
     }
-  } else { // symbol
-    const targetSym: symbol = target;
+  } else {
     for (; ptr < endPtr; ptr += 14) {
       const keyRaw: i32 = Porffor.wasm.i32.load(ptr, 0, 0);
       if (keyRaw == 0) break; // ran out of keys
-      if (keyRaw >>> 30 == 3) { // MSB 1 and 2 set, symbol
-        const keySym: symbol = keyRaw & 0x3FFFFFFF; // unset MSB
-        if (keySym == targetSym) return ptr;
+
+      const msb: i32 = keyRaw >>> 30;
+      if (msb == 0) {
+        // bytestring
+        const keyStr: bytestring = keyRaw;
+        if (Porffor.strcmp(keyStr, target)) return ptr;
+      } else if (msb == 2) {
+        // string
+        const keyStr: string = keyRaw & 0x7FFFFFFF; // unset MSB
+        if (Porffor.strcmp(keyStr, target)) return ptr;
       }
     }
   }
@@ -170,58 +166,96 @@ export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
   return -1;
 };
 
-export const __Porffor_object_get = (obj: any, key: any): any => {
-  const trueType: i32 = Porffor.wasm`local.get ${obj+1}`;
-  if (trueType == Porffor.TYPES.function) {
-    const tmp1: bytestring = 'name';
-    if (key == tmp1) {
-      const o: bytestring = __Porffor_funcLut_name(obj);
-      const t: i32 = Porffor.TYPES.bytestring;
-      Porffor.wasm`
-local.get ${o}
-f64.convert_i32_u
-local.get ${t}
-return`;
-    }
-
-    const tmp2: bytestring = 'length';
-    if (key == tmp2) {
-      const o: i32 = __Porffor_funcLut_length(obj);
-      Porffor.wasm`
-local.get ${o}
-f64.convert_i32_u
-i32.const 1
+export const __Porffor_object_readValue = (entryPtr: i32): any => {
+  Porffor.wasm`
+local.get ${entryPtr}
+f64.load 0 4
+local.get ${entryPtr}
+i32.load8_u 0 13
 return`;
-    }
-  }
+};
 
+export const __Porffor_object_get = (obj: any, key: any): any => {
+  const trueType: i32 = Porffor.wasm`local.get ${obj+1}`;
   if (trueType != Porffor.TYPES.object) obj = __Porffor_object_underlying(obj);
 
   if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot get property of null');
 
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
-    if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.object) {
-      // check prototype chain
-      const protoKey: bytestring = '__proto__';
-      let lastProto: any = obj;
-      if (key != protoKey) {
-        while (true) {
-          obj = __Porffor_object_get(obj, protoKey);
-          if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
-          lastProto = obj;
-
-          if ((entryPtr = __Porffor_object_lookup(obj, key)) != -1) break;
+    // check prototype chain
+    const protoKey: bytestring = '__proto__';
+    let lastProto: any = obj;
+    if (key != protoKey) {
+      while (true) {
+        obj = __Porffor_object_get(obj, protoKey);
+
+        if (Porffor.comptime.flag`hasFunc.#get___String_prototype`) {
+          if (Porffor.fastOr(
+            trueType == Porffor.TYPES.string,
+            trueType == Porffor.TYPES.bytestring,
+            trueType == Porffor.TYPES.stringobject
+          )) {
+            obj = __String_prototype;
+          }
         }
-      } else {
-        let proto: i32 = __Object_prototype;
-        if (trueType == Porffor.TYPES.function) proto = __Function_prototype;
-        Porffor.wasm`
+
+        if (Porffor.comptime.flag`hasFunc.#get___Number_prototype`) {
+          if (Porffor.fastOr(
+            trueType == Porffor.TYPES.number,
+            trueType == Porffor.TYPES.numberobject
+          )) {
+            obj = __Number_prototype;
+          }
+        }
+
+        if (Porffor.comptime.flag`hasFunc.#get___Boolean_prototype`) {
+          if (Porffor.fastOr(
+            trueType == Porffor.TYPES.boolean,
+            trueType == Porffor.TYPES.booleanobject
+          )) {
+            obj = __Boolean_prototype;
+          }
+        }
+
+        if (Porffor.comptime.flag`hasFunc.#get___Function_prototype`) {
+          if (trueType == Porffor.TYPES.function) {
+            obj = __Function_prototype;
+          }
+        }
+
+        if (Porffor.comptime.flag`hasFunc.#get___Array_prototype`) {
+          if (trueType == Porffor.TYPES.array) {
+            obj = __Array_prototype;
+          }
+        }
+
+        if (Porffor.comptime.flag`hasFunc.#get___Date_prototype`) {
+          if (trueType == Porffor.TYPES.date) {
+            obj = __Date_prototype;
+          }
+        }
+
+        if (Porffor.comptime.flag`hasFunc.#get___Error_prototype`) {
+          if (trueType == Porffor.TYPES.error) {
+            obj = __Error_prototype;
+          }
+        }
+
+        if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
+        lastProto = obj;
+
+        if ((entryPtr = __Porffor_object_lookup(obj, key)) != -1) break;
+      }
+    } else {
+      let proto: i32 = __Object_prototype;
+      if (trueType == Porffor.TYPES.function) proto = __Function_prototype;
+
+      Porffor.wasm`
 local.get ${proto}
 f64.convert_i32_u
 i32.const 7 ;; object type
 return`;
-      }
     }
 
     if (entryPtr == -1) {
@@ -535,20 +569,6 @@ local.set ${err}`;
 export const __Porffor_object_delete = (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_underlying(obj);
   if (Porffor.rawType(obj) != Porffor.TYPES.object) {
     // todo: support non-pure objects
@@ -600,20 +620,6 @@ memory.copy 0 0`;
 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_underlying(obj);
   if (Porffor.rawType(obj) != Porffor.TYPES.object) {
     // todo: support non-pure objects

package/compiler/builtins/object.ts

@@ -150,16 +150,6 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
     return Porffor.object.lookup(_this, p) != -1;
   }
 
-  if (t == Porffor.TYPES.function) {
-    const tmp1: bytestring = 'name';
-    if (p == tmp1) return !__Porffor_funcLut_isNameDeleted(_this);
-
-    const tmp2: bytestring = 'length';
-    if (p == tmp2) return !__Porffor_funcLut_isLengthDeleted(_this);
-
-    return Porffor.object.lookup(_this, p) != -1;
-  }
-
   const obj: any = __Porffor_object_underlying(_this);
   if (Porffor.rawType(obj) == Porffor.TYPES.object) {
     if (Porffor.object.lookup(obj, p) != -1) return true;
@@ -576,15 +566,27 @@ export const __Object_defineProperty = (target: any, prop: any, desc: any) => {
 
   const existingDesc: any = __Object_getOwnPropertyDescriptor(target, prop);
   if (existingDesc) {
-    configurable ??= existingDesc.configurable;
-    enumerable ??= existingDesc.enumerable;
+    let inKey: bytestring = '';
+
+    // probably slow due to excessive in's but needs to have them to be spec compliant handling explicit undefined vs non-existent
+    inKey = 'configurable';
+    if (configurable == null && !(inKey in desc)) configurable = existingDesc.configurable;
+
+    inKey = 'enumerable';
+    if (enumerable == null && !(inKey in desc)) enumerable = existingDesc.enumerable;
 
     if (accessor) {
-      get ??= existingDesc.get;
-      set ??= existingDesc.set;
+      inKey = 'get';
+      if (get == null && !(inKey in desc)) get = existingDesc.get;
+
+      inKey = 'set';
+      if (set == null && !(inKey in desc)) set = existingDesc.set;
     } else {
-      value ??= existingDesc.value;
-      writable ??= existingDesc.writable;
+      inKey = 'value';
+      if (value == null && !(inKey in desc)) value = existingDesc.value;
+
+      inKey = 'writable';
+      if (writable == null && !(inKey in desc)) writable = existingDesc.writable;
     }
   }
 
@@ -674,11 +676,19 @@ export const __Object_prototype_isPrototypeOf = (_this: any, obj: any) => {
 
 export const __Object_prototype_toString = (_this: any) => {
   if (Porffor.rawType(_this) == Porffor.TYPES.object) {
-     // todo: breaks with Foo.prototype
+    // todo: breaks with Foo.prototype
     const obj: object = _this;
     if (obj != null) {
-      const ovr: any = obj.toString;
-      if (ovr != null && ovr !== __Object_prototype_toString) return ovr.call(_this);
+      let ovr: any = obj.toString;
+      if (Porffor.rawType(ovr) == Porffor.TYPES.function && ovr != __Object_prototype_toString) return ovr.call(_this);
+
+      const key: bytestring = 'toString';
+      const entryPtr: i32 = Porffor.object.lookup(obj, key);
+      if (entryPtr != -1) {
+        ovr = Porffor.object.readValue(entryPtr);
+        if (Porffor.rawType(ovr) == Porffor.TYPES.function) return ovr.call(_this);
+          else return undefined;
+      }
     }
   }
 
@@ -719,8 +729,16 @@ export const __Object_prototype_valueOf = (_this: any) => {
     // todo: breaks with Foo.prototype
     const obj: object = _this;
     if (obj != null) {
-      const ovr: any = obj.valueOf;
-      if (ovr != null && ovr !== __Object_prototype_valueOf) return ovr.call(_this);
+      let ovr: any = obj.valueOf;
+      if (Porffor.rawType(ovr) == Porffor.TYPES.function && ovr != __Object_prototype_valueOf) return ovr.call(_this);
+
+      const key: bytestring = 'valueOf';
+      const entryPtr: i32 = Porffor.object.lookup(obj, key);
+      if (entryPtr != -1) {
+        ovr = Porffor.object.readValue(entryPtr);
+        if (Porffor.rawType(ovr) == Porffor.TYPES.function) return ovr.call(_this);
+          else return undefined;
+      }
     }
   }
 

package/compiler/builtins.js

@@ -100,7 +100,7 @@ export const BuiltinVars = function(ctx) {
   this.Infinity.floatOnly = true;
 
   for (const x in TYPES) {
-    this['__Porffor_TYPES_' + x] = number(TYPES[x]);
+    this['__Porffor_TYPES_' + x] = () => number(TYPES[x]);
   }
 
   this.__performance_timeOrigin = [
@@ -1048,65 +1048,5 @@ export const BuiltinFuncs = function() {
     table: true
   };
 
-  this.__Porffor_funcLut_deleteLength = {
-    params: [ Valtype.i32 ],
-    returns: [],
-    wasm: (scope, { allocPage }) => [
-      [ Opcodes.local_get, 0 ],
-      ...number(64, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...number(2, Valtype.i32),
-      [ Opcodes.i32_add ],
-      ...number(0, Valtype.i32),
-      [ Opcodes.i32_store16, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ],
-
-      [ Opcodes.local_get, 0 ],
-      ...number(1, Valtype.i32),
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table')) ]
-    ],
-    table: true
-  };
-
-  this.__Porffor_funcLut_deleteName = {
-    params: [ Valtype.i32 ],
-    returns: [],
-    wasm: (scope, { allocPage }) => [
-      [ Opcodes.local_get, 0 ],
-      ...number(64, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...number(5, Valtype.i32),
-      [ Opcodes.i32_add ],
-      ...number(0, Valtype.i32),
-      [ Opcodes.i32_store, 0, ...unsignedLEB128(allocPage(scope, 'func lut')) ],
-
-      [ Opcodes.local_get, 0 ],
-      ...number(1, Valtype.i32),
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table')) ],
-    ],
-    table: true
-  };
-
-  this.__Porffor_funcLut_isLengthDeleted = {
-    params: [ Valtype.i32 ],
-    returns: [ Valtype.i32 ],
-    returnType: TYPES.boolean,
-    wasm: (scope, { allocPage }) => [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table')) ]
-    ],
-    table: true
-  };
-
-  this.__Porffor_funcLut_isNameDeleted = {
-    params: [ Valtype.i32 ],
-    returns: [ Valtype.i32 ],
-    returnType: TYPES.boolean,
-    wasm: (scope, { allocPage }) => [
-      [ Opcodes.local_get, 0 ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table')) ]
-    ],
-    table: true
-  };
-
   PrecompiledBuiltins.BuiltinFuncs.call(this);
 };

package/compiler/builtins_objects.js

@@ -199,7 +199,16 @@ export default function({ builtinFuncs }, Prefs) {
     const props = autoFuncs(x);
 
     // special case: Object.prototype.__proto__ = null
-    if (x === '__Object_prototype') Object.defineProperty(props, '__proto__', { value: { value: null }, enumerable: true });
+    if (x === '__Object_prototype') {
+      Object.defineProperty(props, '__proto__', { value: { value: null, configurable: true }, enumerable: true });
+    }
+
+    // special case: Function.prototype.length = 0
+    // special case: Function.prototype.name = ''
+    if (x === '__Function_prototype') {
+      props.length = { value: 0, configurable: true };
+      props.name = { value: '', configurable: true };
+    }
 
     // add constructor for constructors
     const name = x.slice(2, x.indexOf('_', 2));