porffor 0.35.3 → 0.36.0

package/compiler/builtins/__internal_object.ts

@@ -6,12 +6,16 @@ export const __Porffor_object_getObject = (obj: any): any => {
     if (underlying == null) {
       underlying = {};
 
-      const proto = {};
-      const key1: bytestring = 'prototype';
-      __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
+      // set prototype and prototype.constructor if constructor
+      const flags: i32 = __Porffor_funcLut_flags(funcI32);
+      if (flags & 0b10) { // constructor
+        const proto = {};
+        const key1: bytestring = 'prototype';
+        __Porffor_object_expr_initWithFlags(underlying, key1, proto, 0b1000);
 
-      const key2: bytestring = 'constructor';
-      __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
+        const key2: bytestring = 'constructor';
+        __Porffor_object_expr_initWithFlags(proto, key2, obj, 0b1010);
+      }
 
       underlyingFuncObjs.set(funcI32, underlying);
     }

package/compiler/builtins/object.ts

@@ -18,6 +18,7 @@ export const __Object_keys = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const out: any[] = Porffor.allocate();
 
+  obj = __Porffor_object_getObject(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -82,9 +83,9 @@ local.set ${key}`;
 
 export const __Object_values = (obj: any): any[] => {
   if (obj == null) throw new TypeError('Argument is nullish, expected object');
-
   const out: any[] = Porffor.allocate();
 
+  obj = __Porffor_object_getObject(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
     let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
@@ -177,7 +178,7 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
     const tmp2: bytestring = 'length';
     if (p == tmp2) return !__Porffor_funcLut_isLengthDeleted(_this);
 
-    return false;
+    return Porffor.object.lookup(_this, p) != -1;
   }
 
   const keys: any[] = __Object_keys(_this);
@@ -193,10 +194,6 @@ export const __Porffor_object_in = (obj: any, prop: any) => {
     return true;
   }
 
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return false;
-  }
-
   let lastProto = obj;
   while (true) {
     obj = obj.__proto__;
@@ -225,7 +222,6 @@ export const __Porffor_object_instanceof = (obj: any, constr: any) => {
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
     lastProto = obj;
 
-    console.log(obj === Object.prototype);
     if (obj === checkProto) return true;
   }
 
@@ -266,8 +262,8 @@ export const __Porffor_object_assignAll = (target: any, source: any) => {
 export const __Object_prototype_propertyIsEnumerable = (_this: any, prop: any) => {
   const p: any = ecma262.ToPropertyKey(prop);
 
-  const t: i32 = Porffor.rawType(_this);
-  if (t == Porffor.TYPES.object) {
+  const obj: any = __Porffor_object_getObject(_this);
+  if (Porffor.rawType(obj) == Porffor.TYPES.object) {
     const entryPtr: i32 = Porffor.object.lookup(_this, p);
     if (entryPtr == -1) return false;
 
@@ -366,23 +362,24 @@ export const __Object_isSealed = (obj: any): any => {
 export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): any => {
   const p: any = ecma262.ToPropertyKey(prop);
 
-  const objType: i32 = Porffor.rawType(obj);
-  if (objType == Porffor.TYPES.function) {
-    // hack: function .name and .length
-    const v = obj[p];
-    if (v != null) {
-      const out: object = {};
-      out.writable = false;
-      out.enumerable = false;
-      out.configurable = true;
-
-      out.value = v;
-      return out;
+  const entryPtr: i32 = Porffor.object.lookup(obj, p);
+  if (entryPtr == -1) {
+    if (Porffor.rawType(obj) == Porffor.TYPES.function) {
+      // hack: function .name and .length
+      const v = obj[p];
+      if (v != null) {
+        const out: object = {};
+        out.writable = false;
+        out.enumerable = false;
+        out.configurable = true;
+
+        out.value = v;
+        return out;
+      }
     }
-  }
 
-  const entryPtr: i32 = Porffor.object.lookup(obj, p);
-  if (entryPtr == -1) return undefined;
+    return undefined;
+  }
 
   const out: object = {};
 

package/compiler/builtins_objects.js

@@ -27,7 +27,7 @@ export default function({ builtinFuncs }, Prefs) {
 
         let ptr;
         if (existingFunc) {
-          ptr = 1;
+          ptr = builtin(name, true);
         } else {
           ptr = allocPage(scope, `builtin object: ${name}`);
         }
@@ -90,15 +90,12 @@ export default function({ builtinFuncs }, Prefs) {
     };
 
     if (existingFunc) {
-      const originalWasm = existingFunc.wasm;
-      existingFunc.wasm = (...args) => {
-        const { builtin } = args[1];
-        return [
-          [ Opcodes.call, builtin('#get_' + name) ],
-          [ Opcodes.drop ],
-          ...originalWasm(...args)
-        ];
-      };
+      this[name] = (scope, { builtin, funcRef }) => [
+        [ Opcodes.call, builtin('#get_' + name) ],
+        [ Opcodes.drop ],
+        ...funcRef(name)
+      ];
+      this[name].type = TYPES.function;
     } else {
       this[name] = (scope, { builtin }) => [
         [ Opcodes.call, builtin('#get_' + name) ],
@@ -109,10 +106,9 @@ export default function({ builtinFuncs }, Prefs) {
 
     for (const x in props) {
       const d = props[x];
+      const k = prefix + x;
 
-      if (Object.hasOwn(d, 'value')) {
-        const k = prefix + x;
-
+      if (Object.hasOwn(d, 'value') && !Object.hasOwn(builtinFuncs, k) && !Object.hasOwn(this, k)) {
         if (typeof d.value === 'number') {
           this[k] = number(d.value);
           this[k].type = TYPES.number;
@@ -159,7 +155,7 @@ export default function({ builtinFuncs }, Prefs) {
   const builtinFuncKeys = Object.keys(builtinFuncs);
   const autoFuncKeys = name => {
     const prefix = makePrefix(name);
-    return builtinFuncKeys.filter(x => x.startsWith(prefix)).map(x => x.slice(prefix.length));
+    return builtinFuncKeys.filter(x => x.startsWith(prefix)).map(x => x.slice(prefix.length)).filter(x => !x.startsWith('prototype_'));
   };
   const autoFuncs = name => props({
     writable: true,
@@ -209,7 +205,6 @@ export default function({ builtinFuncs }, Prefs) {
   }
 
 
-  // todo: support when existing func
   object('Number', {
     ...props({
       writable: false,
@@ -227,9 +222,13 @@ export default function({ builtinFuncs }, Prefs) {
       MIN_SAFE_INTEGER: valtype === 'i32' ? -2147483648 : -9007199254740991,
 
       EPSILON: 2.220446049250313e-16
-    })
+    }),
+
+    ...autoFuncs('Number')
   });
 
+  object('Object', autoFuncs('Object'));
+
 
   // these technically not spec compliant as it should be classes or non-enumerable but eh
   object('navigator', {
@@ -305,8 +304,8 @@ export default function({ builtinFuncs }, Prefs) {
     }
     if (!t) continue;
 
-    if (!done.has(name)) {
-      console.log(name.replaceAll('_', '.'), !!builtinFuncs[name]);
+    if (!done.has(name) && !done.has('__' + name)) {
+      console.log(name, !!builtinFuncs[name]);
       done.add(name);
     }
   }