porffor 0.30.7 → 0.30.9

package/compiler/builtins/__internal_object.ts

@@ -0,0 +1,15 @@
+const underlyingFuncObjs: Map = new Map();
+export const __Porffor_object_getObject = (obj: any): any => {
+  if (Porffor.rawType(obj) == Porffor.TYPES.function) {
+    const funcI32: i32 = Porffor.wasm`local.get ${obj}`;
+    let underlying: object = underlyingFuncObjs.get(funcI32);
+    if (underlying == null) {
+      underlying = Porffor.allocate();
+      underlyingFuncObjs.set(funcI32, underlying);
+    }
+
+    return underlying;
+  }
+
+  return obj;
+};

package/compiler/builtins/_internal_object.ts

@@ -16,19 +16,22 @@ import type {} from './porffor.d.ts';
 //   enumerable - 0b0100
 //   writable - 0b1000
 
-export const __Porffor_object_preventExtensions = (obj: object): void => {
+export const __Porffor_object_preventExtensions = (obj: any): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let rootFlags: i32 = Porffor.wasm.i32.load8_u(obj, 0, 4);
   rootFlags |= 0b0001;
   Porffor.wasm.i32.store8(obj, rootFlags, 0, 4);
 };
 
-export const __Porffor_object_isInextensible = (obj: object): boolean => {
+export const __Porffor_object_isInextensible = (obj: any): boolean => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   const out: boolean = Porffor.wasm.i32.load8_u(obj, 0, 4) & 0b0001;
   return out;
 };
 
 
-export const __Porffor_object_overrideAllFlags = (obj: object, overrideOr: i32, overrideAnd: i32): void => {
+export const __Porffor_object_overrideAllFlags = (obj: any, overrideOr: i32, overrideAnd: i32): void => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
 
   const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
@@ -41,7 +44,8 @@ export const __Porffor_object_overrideAllFlags = (obj: object, overrideOr: i32,
   }
 };
 
-export const __Porffor_object_checkAllFlags = (obj: object, dataAnd: i32, accessorAnd: i32, dataExpected: i32, accessorExpected: i32): boolean => {
+export const __Porffor_object_checkAllFlags = (obj: any, dataAnd: i32, accessorAnd: i32, dataExpected: i32, accessorExpected: i32): boolean => {
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
 
   const size: i32 = Porffor.wasm.i32.load(obj, 0, 0);
@@ -101,8 +105,9 @@ export const __Porffor_object_accessorSet = (entryPtr: i32): Function => {
 };
 
 
-export const __Porffor_object_lookup = (obj: object, target: any): i32 => {
+export const __Porffor_object_lookup = (obj: any, target: any): i32 => {
   if (Porffor.wasm`local.get ${obj}` == 0) return -1;
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
 
   const targetType: i32 = Porffor.wasm`local.get ${target+1}`;
 
@@ -171,14 +176,9 @@ f64.convert_i32_u
 i32.const 1
 return`;
     }
-
-    // undefined
-    Porffor.wasm`
-f64.const 0
-i32.const 128
-return`;
   }
 
+  if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
   const entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     Porffor.wasm`
@@ -244,9 +244,10 @@ export const __Porffor_object_writeKey = (ptr: i32, key: any): void => {
   Porffor.wasm.i32.store(ptr, keyEnc, 0, 0);
 };
 
-export const __Porffor_object_set = (obj: object, key: any, value: any): any => {
+export const __Porffor_object_set = (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);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   let flags: i32;
   if (entryPtr == -1) {
@@ -326,7 +327,8 @@ export const __Porffor_object_set = (obj: object, key: any, value: any): any =>
   return value;
 };
 
-export const __Porffor_object_define = (obj: object, key: any, value: any, flags: i32): void => {
+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);
   let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
     // add new entry
@@ -393,6 +395,23 @@ 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) {
+    let tmp: bytestring = '';
+    tmp = 'name';
+    if (key == tmp) {
+      __Porffor_funcLut_deleteName(obj);
+      return true;
+    }
+
+    tmp = 'length';
+    if (key == tmp) {
+      __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;
@@ -458,6 +477,15 @@ export const __Porffor_object_isObject = (arg: any): boolean => {
   );
 };
 
+export const __Porffor_object_isObjectOrNull = (arg: any): boolean => {
+  const t: i32 = Porffor.wasm`local.get ${arg+1}`;
+  return Porffor.fastAnd(
+    t > 0x05,
+    t != Porffor.TYPES.string,
+    t != Porffor.TYPES.bytestring,
+  );
+};
+
 export const __Porffor_object_isObjectOrSymbol = (arg: any): boolean => {
   const t: i32 = Porffor.wasm`local.get ${arg+1}`;
   return Porffor.fastAnd(

package/compiler/builtins/object.ts

@@ -174,10 +174,10 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
     let tmp: bytestring = '';
 
     tmp = 'name';
-    if (p == tmp) return true;
+    if (p == tmp) return !__Porffor_funcLut_isNameDeleted(_this);
 
     tmp = 'length';
-    if (p == tmp) return true;
+    if (p == tmp) return !__Porffor_funcLut_isLengthDeleted(_this);
 
     return false;
   }
@@ -603,13 +603,12 @@ export const __Object_defineProperties = (target: any, props: any) => {
 };
 
 export const __Object_create = (proto: any, props: any) => {
-  if (!Porffor.object.isObject(proto)) {
-    if (proto !== null) throw new TypeError('Prototype should be an object or null');
-  }
+  if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
 
   const out: object = {};
 
-  // todo: set prototype when supported
+  // set prototype
+  out.__proto__ = proto;
 
   if (props !== undefined) __Object_defineProperties(out, props);
 
@@ -635,6 +634,34 @@ export const __Object_groupBy = (items: any, callbackFn: any) => {
 };
 
 
+export const __Object_getPrototypeOf = (obj: any) => {
+  if (obj == null) throw new TypeError('Object is nullish, expected object');
+
+  // todo: support non-pure-objects
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
+    return {};
+  }
+
+  return obj.__proto__;
+};
+
+export const __Object_setPrototypeOf = (obj: any, proto: any) => {
+  if (obj == null) throw new TypeError('Object is nullish, expected object');
+  if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
+
+  // todo: support non-pure-objects
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
+    return obj;
+  }
+
+  // todo: throw when this fails?
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/setPrototypeOf#exceptions
+  obj.__proto__ = proto;
+
+  return obj;
+};
+
+
 export const __Object_prototype_toString = (_this: any) => {
   let out: bytestring = Porffor.allocate();
 

package/compiler/builtins/porffor.d.ts

@@ -60,6 +60,7 @@ type PorfforGlobal = {
     isEnumerable(entryPtr: i32): boolean;
 
     isObject(arg: any): boolean;
+    isObjectOrNull(arg: any): boolean;
     isObjectOrSymbol(arg: any): boolean;
 
     expr: {

package/compiler/builtins/reflect.ts

@@ -66,6 +66,23 @@ export const __Reflect_preventExtensions = (target: any) => {
   }
 };
 
+export const __Reflect_getPrototypeOf = (target: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  return Object.getPrototypeOf(target);
+};
+
+export const __Reflect_setPrototypeOf = (target: any, proto: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  try {
+    Object.setPrototypeOf(target, proto);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 export const __Reflect_ownKeys = (target: any) => {
   if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
 

package/compiler/builtins.js

@@ -1090,5 +1090,65 @@ export const BuiltinFuncs = function() {
     table: true
   };
 
+  this.__Porffor_funcLut_deleteLength = {
+    params: [ Valtype.i32 ],
+    returns: [],
+    wasm: (scope, { allocPage }) => [
+      [ Opcodes.local_get, 0 ],
+      ...number(128, 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') * pageSize) ],
+
+      [ Opcodes.local_get, 0 ],
+      ...number(1, Valtype.i32),
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func length deletion table') * pageSize) ]
+    ],
+    table: true
+  };
+
+  this.__Porffor_funcLut_deleteName = {
+    params: [ Valtype.i32 ],
+    returns: [],
+    wasm: (scope, { allocPage }) => [
+      [ Opcodes.local_get, 0 ],
+      ...number(128, 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') * pageSize) ],
+
+      [ Opcodes.local_get, 0 ],
+      ...number(1, Valtype.i32),
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(allocPage(scope, 'func name deletion table') * pageSize) ],
+    ],
+    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') * pageSize) ]
+    ],
+    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') * pageSize) ]
+    ],
+    table: true
+  };
+
   PrecompiledBuiltins.BuiltinFuncs.call(this);
 };