porffor 0.55.23 → 0.55.25

package/compiler/2c.js

@@ -1,5 +1,5 @@
 import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
-import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
+import { Blocktype, Opcodes, Valtype, PageSize } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
 import { log } from './log.js';
 import './prefs.js';
@@ -218,7 +218,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
   if (pages.size > 0) {
     includes.set('stdlib.h', true);
     prepend.set('_memory', `char* _memory; u32 _memoryPages = ${pages.size};\n`);
-    prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${pageSize});\n`);
+    prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${PageSize});\n`);
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
   }
 

package/compiler/allocator.js

@@ -1,9 +1,8 @@
-import { PageSize } from './wasmSpec.js';
 import './prefs.js';
 
 const pagePtr = ind => {
   if (ind === 0) return 16;
-  return ind * PageSize;
+  return ind * pageSize;
 };
 
 export const nameToReason = (scope, name) => {
@@ -37,7 +36,7 @@ export const allocBytes = ({ scope, pages }, reason, bytes) => {
     return allocs.get(reason);
   }
 
-  let bin = bins.find(x => (PageSize - x.used) >= bytes);
+  let bin = bins.find(x => (pageSize - x.used) >= bytes);
   if (!bin) {
     // new bin
     const page = pages.size;

package/compiler/builtins/_internal_object.ts

@@ -182,8 +182,8 @@ export const __Porffor_object_accessorSet = (entryPtr: i32): Function|undefined
 
 export const __Porffor_object_hash = (key: any): i32 => {
   if (Porffor.wasm`local.get ${key+1}` == Porffor.TYPES.symbol) {
-    // symbol, hash is just the symbol
-    return key as number;
+    // symbol, hash is unused so just return 0
+    return 0;
   }
 
   // bytestring or string, fnv-1a hash (custom variant)
@@ -386,26 +386,28 @@ export const __Porffor_object_lookup = (obj: any, target: any, targetHash: i32):
       }
     }
   } else {
-    if (targetHash == 0) targetHash = __Porffor_object_hash(target);
     for (; ptr < endPtr; ptr += 18) {
-      const hash: i32 = Porffor.wasm.i32.load(ptr, 0, 0);
-
-      // todo: is below needed anymore?
-      if (hash == 0) {
-        if (out) break; // ran out of keys
-        out = true;
-      }
-
-      if (hash == targetHash) {
+      if (Porffor.wasm.i32.load(ptr, 0, 0) == targetHash) {
         const key: i32 = Porffor.wasm.i32.load(ptr, 0, 4);
-        const msb: i32 = key >>> 30;
-        if (msb == 0) {
-          // bytestring
-          if (Porffor.strcmp(key as bytestring, target)) return ptr;
-        } else if (msb == 2) {
-          // string (unset MSB)
-          if (Porffor.strcmp((key & 0x7FFFFFFF) as string, target)) return ptr;
-        }
+        Porffor.wasm`
+local.get ${key}
+i32.const 2147483647
+i32.and
+
+i32.const 67 ;; bytestring
+i32.const 195 ;; string
+local.get ${key}
+i32.const 30
+i32.shr_u
+select
+
+local.get ${target}
+local.get ${target+1}
+call __Porffor_strcmp
+if 64
+  local.get ${ptr}
+  return
+end`;
       }
     }
   }
@@ -801,7 +803,7 @@ export const __Porffor_object_delete = (obj: any, key: any): boolean => {
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return true;
   }
 
-  const entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  const entryPtr: i32 = __Porffor_object_lookup(obj, key, __Porffor_object_hash(key));
   if (entryPtr == -1) {
     // not found, stop
     return true;
@@ -851,7 +853,7 @@ export const __Porffor_object_deleteStrict = (obj: any, key: any): boolean => {
     if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) return true;
   }
 
-  const entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  const entryPtr: i32 = __Porffor_object_lookup(obj, key, __Porffor_object_hash(key));
   if (entryPtr == -1) {
     // not found, stop
     return true;

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/object.ts

@@ -143,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);
@@ -172,7 +173,7 @@ export const __Porffor_object_in = (obj: any, prop: any): boolean => {
 
   let lastProto = obj;
   while (true) {
-    obj = Porffor.object.getPrototypeWithHidden(obj);
+    obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
 
     if (__Object_prototype_hasOwnProperty(obj, prop)) return true;
@@ -193,7 +194,7 @@ export const __Porffor_object_instanceof = (obj: any, constr: any, checkProto: a
 
   let lastProto = obj;
   while (true) {
-    obj = Porffor.object.getPrototypeWithHidden(obj);
+    obj = Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
     if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
 
     if (obj === checkProto) return true;
@@ -235,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);
@@ -246,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);
   }
 
@@ -339,9 +342,10 @@ export const __Object_isSealed = (obj: any): boolean => {
 
 
 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
@@ -636,7 +640,7 @@ 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 Porffor.object.getPrototypeWithHidden(obj);
+  return Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
 };
 
 export const __Object_setPrototypeOf = (obj: any, proto: any): any => {
@@ -653,7 +657,7 @@ export const __Object_prototype_isPrototypeOf = (_this: any, obj: any) => {
   if (_this == null) throw new TypeError('This is nullish, expected object');
 
   if (!Porffor.object.isObject(obj)) return false;
-  return _this == Porffor.object.getPrototypeWithHidden(obj);
+  return _this == Porffor.object.getPrototypeWithHidden(obj, Porffor.rawType(obj));
 };
 
 
@@ -665,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);
@@ -712,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

@@ -1,6 +1,6 @@
 export default ({ TYPES, TYPE_NAMES }) => {
   let out = `// @porf --valtype=i32
-export const __Porffor_object_getPrototypeWithHidden = (obj: any, trueType: i32 = Porffor.wasm\`local.get \${obj+1}\`): any => {
+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\`) {

package/compiler/builtins.js

@@ -1,6 +1,6 @@
 import * as PrecompiledBuiltins from './builtins_precompiled.js';
 import ObjectBuiltins from './builtins_objects.js';
-import { Blocktype, Opcodes, Valtype, ValtypeSize } from './wasmSpec.js';
+import { PageSize, Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { TYPES, TYPE_NAMES } from './types.js';
 import { number, unsignedLEB128 } from './encoding.js';
 import './prefs.js';
@@ -778,7 +778,7 @@ export const BuiltinFuncs = function() {
       wasm: [
         number(1, Valtype.i32),
         [ Opcodes.memory_grow, 0 ],
-        number(pageSize, Valtype.i32),
+        number(PageSize, Valtype.i32),
         [ Opcodes.i32_mul ]
       ]
     },
@@ -787,23 +787,23 @@ export const BuiltinFuncs = function() {
       locals: [],
       globals: [ Valtype.i32, Valtype.i32 ],
       globalNames: [ 'chunkPtr', 'chunkOffset' ],
-      globalInits: [ 0, 100 * pageSize ],
+      globalInits: [ 0, 100 * PageSize ],
       returns: [ Valtype.i32 ],
       returnType: TYPES.number,
       wasm: [
         // if chunkOffset >= chunks:
         [ Opcodes.global_get, 1 ],
-        number(pageSize * (Prefs.allocatorChunks ?? 16), Valtype.i32),
+        number(PageSize * (Prefs.allocatorChunks ?? 16), Valtype.i32),
         [ Opcodes.i32_ge_s ],
         [ Opcodes.if, Valtype.i32 ],
           // chunkOffset = 1 page
-          number(1 * pageSize, Valtype.i32),
+          number(pageSize, Valtype.i32),
           [ Opcodes.global_set, 1 ],
 
           // return chunkPtr = allocated
           number(Prefs.allocatorChunks ?? 16, Valtype.i32),
           [ Opcodes.memory_grow, 0 ],
-          number(pageSize, Valtype.i32),
+          number(PageSize, Valtype.i32),
           [ Opcodes.i32_mul ],
           [ Opcodes.global_set, 0 ],
           [ Opcodes.global_get, 0 ],

package/compiler/builtins_objects.js

@@ -1,4 +1,4 @@
-import { Blocktype, Opcodes, PageSize, Valtype } from './wasmSpec.js';
+import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { TYPES } from './types.js';
 import { number } from './encoding.js';