porffor 0.55.22 → 0.55.24

package/compiler/builtins/bigint.ts

@@ -127,9 +127,9 @@ export const __Porffor_bigint_fromString = (n: string|bytestring): bigint => {
   return __Porffor_bigint_fromDigits(negative, result);
 };
 
-export const __Porffor_bigint_toString = (x: number, radix: any): string => {
+export const __Porffor_bigint_toString = (x: number, radix: any): string|bytestring => {
   // todo: actually use bigint
-  return __Number_prototype_toFixed(__Porffor_bigint_toNumber(x), radix);
+  return __Number_prototype_toString(Math.trunc(__Porffor_bigint_toNumber(x)), radix);
 };
 
 // todo: hook up all funcs below to codegen

package/compiler/builtins/console.ts

@@ -181,7 +181,7 @@ export const __Porffor_print = (arg: any, colors: boolean = true, depth: number
 
     case Porffor.TYPES.function:
       Porffor.printStatic('[Function ');
-      __Porffor_printString(__Porffor_funcLut_name(arg));
+      __Porffor_printString(__Porffor_funcLut_name(arg) || '(anonymous)');
       Porffor.printStatic(']');
       return;
 

package/compiler/builtins/function.ts

@@ -13,7 +13,7 @@ export const __Function_prototype_toLocaleString = (_this: Function) => __Functi
 
 export const __Function_prototype_apply = (_this: Function, thisArg: any, argsArray: any) => {
   argsArray = Array.from(argsArray ?? []);
-  return Reflect.apply(_this, thisArg, argsArray);
+  return Porffor.call(_this, argsArray, thisArg, null);
 };
 
 export const __Function_prototype_bind = (_this: Function, thisArg: any, argsArray: any) => {

package/compiler/builtins/object.ts

@@ -3,8 +3,7 @@ import type {} from './porffor.d.ts';
 export const Object = function (value: any): any {
   if (value == null) {
     // if nullish, return new empty object
-    const obj: object = Porffor.allocate();
-    return obj;
+    return Porffor.allocate() as object;
   }
 
   // primitives into primitive objects
@@ -23,11 +22,11 @@ export const __Object_keys = (obj: any): any[] => {
   obj = __Porffor_object_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
-    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
+    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
     let i: i32 = 0;
-    for (; ptr < endPtr; ptr += 14) {
+    for (; ptr < endPtr; ptr += 18) {
       if (!Porffor.object.isEnumerable(ptr)) continue;
 
       let key: any;
@@ -35,7 +34,7 @@ export const __Object_keys = (obj: any): any[] => {
 local msb i32
 local.get ${ptr}
 i32.to_u
-i32.load 0 0
+i32.load 0 4
 local.set raw
 
 local.get raw
@@ -79,11 +78,11 @@ export const __Object_values = (obj: any): any[] => {
   obj = __Porffor_object_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
-    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
+    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
     let i: i32 = 0;
-    for (; ptr < endPtr; ptr += 14) {
+    for (; ptr < endPtr; ptr += 18) {
       if (!Porffor.object.isEnumerable(ptr)) continue;
 
       let val: any;
@@ -92,11 +91,11 @@ local.get ${ptr}
 i32.to_u
 local.tee ptr32
 
-f64.load 0 4
+f64.load 0 8
 local.set ${val}
 
 local.get ptr32
-i32.load8_u 0 13
+i32.load8_u 0 17
 local.set ${val+1}`;
 
       out[i++] = val;
@@ -144,16 +143,17 @@ export const __Object_fromEntries = (iterable: any): object => {
 
 
 export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
+  if (_this == null) throw new TypeError('Argument is nullish, expected object');
   const p: any = ecma262.ToPropertyKey(prop);
 
   const t: i32 = Porffor.rawType(_this);
   if (t == Porffor.TYPES.object) {
-    return Porffor.object.lookup(_this, p) != -1;
+    return Porffor.object.lookup(_this, p, __Porffor_object_hash(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;
+    if (Porffor.object.lookup(obj, p, __Porffor_object_hash(p)) != -1) return true;
   }
 
   const keys: any[] = __Object_keys(_this);
@@ -165,17 +165,19 @@ export const __Object_hasOwn = (obj: any, prop: any): boolean => {
 };
 
 export const __Porffor_object_in = (obj: any, prop: any): boolean => {
+  // todo: throw if obj is not an object
+
   if (__Object_prototype_hasOwnProperty(obj, prop)) {
     return true;
   }
 
   let lastProto = obj;
   while (true) {
-    obj = obj.__proto__;
+    obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
-    lastProto = obj;
 
     if (__Object_prototype_hasOwnProperty(obj, prop)) return true;
+    lastProto = obj;
   }
 
   return false;
@@ -192,11 +194,11 @@ export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: a
 
   let lastProto = obj;
   while (true) {
-    obj = obj.__proto__;
+    obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
-    lastProto = obj;
 
     if (obj === checkProto) return true;
+    lastProto = obj;
   }
 
   return false;
@@ -234,10 +236,12 @@ export const __Porffor_object_assignAll = (target: any, source: any): any => {
 
 
 export const __Object_prototype_propertyIsEnumerable = (_this: any, prop: any) => {
+  if (_this == null) throw new TypeError('Argument is nullish, expected object');
+
   const p: any = ecma262.ToPropertyKey(prop);
 
   if (Porffor.rawType(_this) == Porffor.TYPES.object) {
-    const entryPtr: i32 = Porffor.object.lookup(_this, p);
+    const entryPtr: i32 = Porffor.object.lookup(_this, p, __Porffor_object_hash(p));
     if (entryPtr == -1) return false;
 
     return Porffor.object.isEnumerable(entryPtr);
@@ -245,7 +249,7 @@ export const __Object_prototype_propertyIsEnumerable = (_this: any, prop: any) =
 
   const obj: any = __Porffor_object_underlying(_this);
   if (Porffor.rawType(obj) == Porffor.TYPES.object) {
-    const entryPtr: i32 = Porffor.object.lookup(obj, p);
+    const entryPtr: i32 = Porffor.object.lookup(obj, p, __Porffor_object_hash(p));
     if (entryPtr != -1) return Porffor.object.isEnumerable(entryPtr);
   }
 
@@ -275,11 +279,10 @@ export const __Object_is = (x: any, y: any): boolean => {
 
 export const __Object_preventExtensions = (obj: any): any => {
   Porffor.object.preventExtensions(obj);
-
   return obj;
 };
 
-export const __Object_isExtensible = (obj: any): any => {
+export const __Object_isExtensible = (obj: any): boolean => {
   if (!Porffor.object.isObject(obj)) {
     return false;
   }
@@ -298,7 +301,7 @@ export const __Object_freeze = (obj: any): any => {
   return obj;
 };
 
-export const __Object_isFrozen = (obj: any): any => {
+export const __Object_isFrozen = (obj: any): boolean => {
   if (!Porffor.object.isObject(obj)) {
     return true;
   }
@@ -323,7 +326,7 @@ export const __Object_seal = (obj: any): any => {
   return obj;
 };
 
-export const __Object_isSealed = (obj: any): any => {
+export const __Object_isSealed = (obj: any): boolean => {
   if (!Porffor.object.isObject(obj)) {
     return true;
   }
@@ -339,9 +342,10 @@ export const __Object_isSealed = (obj: any): any => {
 
 
 export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|undefined => {
+  if (obj == null) throw new TypeError('Argument is nullish, expected object');
   const p: any = ecma262.ToPropertyKey(prop);
 
-  const entryPtr: i32 = Porffor.object.lookup(obj, p);
+  const entryPtr: i32 = Porffor.object.lookup(obj, p, __Porffor_object_hash(p));
   if (entryPtr == -1) {
     if (Porffor.rawType(obj) == Porffor.TYPES.function) {
       // hack: function .name and .length
@@ -360,9 +364,8 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|u
     return undefined;
   }
 
+  const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 16);
   const out: object = {};
-
-  const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
   out.configurable = !!(tail & 0b0010);
   out.enumerable = !!(tail & 0b0100);
 
@@ -374,7 +377,7 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): object|u
   }
 
   // data descriptor
-  const value: any = Porffor.wasm.f64.load(entryPtr, 0, 4);
+  const value: any = Porffor.wasm.f64.load(entryPtr, 0, 8);
   Porffor.wasm`
 local.get ${tail}
 i32.to_u
@@ -412,17 +415,17 @@ export const __Object_getOwnPropertyNames = (obj: any): any[] => {
   obj = __Porffor_object_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
-    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
+    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
     let i: i32 = 0;
-    for (; ptr < endPtr; ptr += 14) {
+    for (; ptr < endPtr; ptr += 18) {
       let key: any;
       Porffor.wasm`local raw i32
 local msb i32
 local.get ${ptr}
 i32.to_u
-i32.load 0 0
+i32.load 0 4
 local.set raw
 
 local.get raw
@@ -467,17 +470,17 @@ export const __Object_getOwnPropertySymbols = (obj: any): any[] => {
   obj = __Porffor_object_underlying(obj);
   const t: i32 = Porffor.rawType(obj);
   if (t == Porffor.TYPES.object) {
-    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 5;
-    const endPtr: i32 = ptr + Porffor.wasm.i32.load(obj, 0, 0) * 14;
+    let ptr: i32 = Porffor.wasm`local.get ${obj}` + 8;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(obj, 0, 0) * 18;
 
     let i: i32 = 0;
-    for (; ptr < endPtr; ptr += 14) {
+    for (; ptr < endPtr; ptr += 18) {
       let key: any;
       Porffor.wasm`local raw i32
 local msb i32
 local.get ${ptr}
 i32.to_u
-i32.load 0 0
+i32.load 0 4
 local.set raw
 
 local.get raw
@@ -609,9 +612,7 @@ export const __Object_create = (proto: any, props: any): object => {
   if (!Porffor.object.isObjectOrNull(proto)) throw new TypeError('Prototype should be an object or null');
 
   const out: object = {};
-
-  // set prototype
-  out.__proto__ = proto;
+  Porffor.object.setPrototype(out, proto);
 
   if (props !== undefined) __Object_defineProperties(out, props);
 
@@ -639,30 +640,24 @@ export const __Object_groupBy = (items: any, callbackFn: any): object => {
 
 export const __Object_getPrototypeOf = (obj: any): any => {
   if (obj == null) throw new TypeError('Object is nullish, expected object');
-
-  return obj.__proto__;
+  return Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
 };
 
 export const __Object_setPrototypeOf = (obj: any, proto: any): 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;
+  // todo: if inextensible, throw if proto != current prototype
 
+  Porffor.object.setPrototype(obj, proto);
   return obj;
 };
 
 export const __Object_prototype_isPrototypeOf = (_this: any, obj: any) => {
   if (_this == null) throw new TypeError('This is nullish, expected object');
 
-  return _this == obj.__proto__;
+  if (!Porffor.object.isObject(obj)) return false;
+  return _this == Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
 };
 
 
@@ -674,7 +669,7 @@ export const __Object_prototype_toString = (_this: any) => {
       let ovr: any = obj.toString;
       if (Porffor.rawType(ovr) == Porffor.TYPES.function && ovr != __Object_prototype_toString) return ovr.call(_this);
 
-      const entryPtr: i32 = Porffor.object.lookup(obj, 'toString');
+      const entryPtr: i32 = Porffor.object.lookup(obj, 'toString', __Porffor_object_hash('toString')); // todo: comptime
       if (entryPtr != -1) {
         ovr = Porffor.object.readValue(entryPtr);
         if (Porffor.rawType(ovr) == Porffor.TYPES.function) return ovr.call(_this);
@@ -721,7 +716,7 @@ export const __Object_prototype_valueOf = (_this: any) => {
       let ovr: any = obj.valueOf;
       if (Porffor.rawType(ovr) == Porffor.TYPES.function && ovr != __Object_prototype_valueOf) return ovr.call(_this);
 
-      const entryPtr: i32 = Porffor.object.lookup(obj, 'valueOf');
+      const entryPtr: i32 = Porffor.object.lookup(obj, 'valueOf', __Porffor_object_hash('valueOf')); // todo: comptime
       if (entryPtr != -1) {
         ovr = Porffor.object.readValue(entryPtr);
         if (Porffor.rawType(ovr) == Porffor.TYPES.function) return ovr.call(_this);

package/compiler/builtins/object_prototypeWithHidden.js

@@ -0,0 +1,47 @@
+export default ({ TYPES, TYPE_NAMES }) => {
+  let out = `// @porf --valtype=i32
+export const __Porffor_object_getPrototypeWithHidden = (obj: any, trueType: i32): any => {
+  const objectProto: any = __Porffor_object_getPrototype(obj);
+  if (Porffor.rawType(objectProto) == Porffor.TYPES.empty) {
+    if (Porffor.comptime.flag\`hasFunc.#get___String_prototype\`) {
+      if (Porffor.fastOr(
+        trueType == Porffor.TYPES.string,
+        trueType == Porffor.TYPES.bytestring,
+        trueType == Porffor.TYPES.stringobject
+      )) return __String_prototype;
+    }
+
+    if (Porffor.comptime.flag\`hasFunc.#get___Number_prototype\`) {
+      if (Porffor.fastOr(
+        trueType == Porffor.TYPES.number,
+        trueType == Porffor.TYPES.numberobject
+      )) return __Number_prototype;
+    }
+
+    if (Porffor.comptime.flag\`hasFunc.#get___Boolean_prototype\`) {
+      if (Porffor.fastOr(
+        trueType == Porffor.TYPES.boolean,
+        trueType == Porffor.TYPES.booleanobject
+      )) return __Boolean_prototype;
+    }`;
+
+  for (const x in TYPES) {
+    if (['empty', 'undefined', 'string', 'bytestring', 'stringobject', 'number', 'numberobject', 'boolean', 'booleanobject'].includes(x)) continue;
+
+    const name = TYPE_NAMES[TYPES[x]];
+    out += `
+    if (Porffor.comptime.flag\`hasFunc.#get___${name}_prototype\`) {
+      if (trueType == Porffor.TYPES.${x}) return __${name}_prototype;
+    }`;
+  }
+
+  // if (trueType == Porffor.TYPES.function) return __Function_prototype;
+  out += `
+    return __Object_prototype;
+  }
+
+  return objectProto;
+};`;
+
+  return out;
+};

package/compiler/builtins/reflect.ts

@@ -91,17 +91,17 @@ export const __Reflect_ownKeys = (target: any) => {
   target = __Porffor_object_underlying(target);
   const t: i32 = Porffor.rawType(target);
   if (t == Porffor.TYPES.object) {
-    let ptr: i32 = Porffor.wasm`local.get ${target}` + 5;
-    const endPtr: i32 = ptr + Porffor.wasm.i32.load(target, 0, 0) * 14;
+    let ptr: i32 = Porffor.wasm`local.get ${target}` + 8;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load16_u(target, 0, 0) * 18;
 
     let i: i32 = 0;
-    for (; ptr < endPtr; ptr += 14) {
+    for (; ptr < endPtr; ptr += 18) {
       let key: any;
       Porffor.wasm`local raw i32
 local msb i32
 local.get ${ptr}
 i32.to_u
-i32.load 0 0
+i32.load 0 4
 local.set raw
 
 local.get raw

package/compiler/builtins/z_ecma262.ts

@@ -156,6 +156,9 @@ export const __ecma262_ToString = (argument: unknown): any => {
   if (type == Porffor.TYPES.number) return __Number_prototype_toString(argument, 10);
 
   // 8. If argument is a BigInt, return BigInt::toString(argument, 10).
+  if (Porffor.comptime.flag`hasType.bigint`) {
+    if (type == Porffor.TYPES.bigint) return __Porffor_bigint_toString(argument, 10);
+  }
 
   // hack: StringObject -> String
   if (type == Porffor.TYPES.stringobject) {