porffor 0.28.6 → 0.28.8

package/compiler/assemble.js

@@ -170,14 +170,18 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       const func = funcs[i];
       let name = func.name;
 
+      // real argc
       let argc = func.params.length;
       if (func.constr) argc -= 4;
       if (!func.internal || func.typedParams) argc = Math.floor(argc / 2);
+      bytes.push(argc % 256, (argc / 256 | 0) % 256);
 
-      // hack: argc-- for prototype methods to remove _this hack from count
-      if (name.includes('_prototype_')) argc--;
+      // userland exposed .length
+      let length = argc;
+      // remove _this from internal prototype funcs
+      if (func.internal && name.includes('_prototype_')) length--;
 
-      bytes.push(argc % 256, (argc / 256 | 0) % 256);
+      bytes.push(length % 256, (length / 256 | 0) % 256);
 
       let flags = 0b00000000; // 8 flag bits
       if (func.returnType != null) flags |= 0b01;
@@ -189,7 +193,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
       bytes.push(...new Uint8Array(new Int32Array([ name.length ]).buffer));
 
-      for (let i = 0; i < (128 - 3 - 4); i++) {
+      for (let i = 0; i < (128 - 5 - 4); i++) {
         const c = name.charCodeAt(i);
         bytes.push((c || 0) % 256);
       }

package/compiler/builtins/z_weakmap.ts

@@ -1,15 +1,22 @@
 import type {} from './porffor.d.ts';
 
-export const __WeakMap_prototype_has = (_this: WeakMap, key: any) => __Map_prototype_has(_this, key);
+export const __WeakMap_prototype_has = (_this: WeakMap, key: any) => {
+  const map: Map = _this;
+  return __Map_prototype_has(map, key);
+};
 
 export const __WeakMap_prototype_set = (_this: WeakMap, key: any, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(key)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  __Map_prototype_set(_this, key, value);
+  const map: Map = _this;
+  __Map_prototype_set(map, key, value);
   return _this;
 };
 
-export const __WeakMap_prototype_delete = (_this: WeakMap, key: any) => __Map_prototype_delete(_this, key);
+export const __WeakMap_prototype_delete = (_this: WeakMap, key: any) => {
+  const map: Map = _this;
+  return __Map_prototype_delete(map, key);
+};
 
 export const WeakMap = function (iterable: any): WeakMap {
   if (!new.target) throw new TypeError("Constructor WeakMap requires 'new'");

package/compiler/builtins/z_weakset.ts

@@ -1,15 +1,22 @@
 import type {} from './porffor.d.ts';
 
-export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => __Set_prototype_has(_this, value);
+export const __WeakSet_prototype_has = (_this: WeakSet, value: any) => {
+  const set: Set = _this;
+  return __Set_prototype_has(set, value);
+};
 
 export const __WeakSet_prototype_add = (_this: WeakSet, value: any) => {
   if (!Porffor.object.isObjectOrSymbol(value)) throw new TypeError('Value in WeakSet needs to be an object or symbol');
 
-  __Set_prototype_add(_this, value);
+  const set: Set = _this;
+  __Set_prototype_add(set, value);
   return _this;
 };
 
-export const __WeakSet_prototype_delete = (_this: WeakSet, value: any) => __Set_prototype_delete(_this, value);
+export const __WeakSet_prototype_delete = (_this: WeakSet, value: any) => {
+  const set: Set = _this;
+  return __Set_prototype_delete(set, value);
+};
 
 export const WeakSet = function (iterable: any): WeakSet {
   if (!new.target) throw new TypeError("Constructor WeakSet requires 'new'");

package/compiler/builtins.js

@@ -1052,7 +1052,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.local_get, 0 ],
       ...number(128, Valtype.i32),
       [ Opcodes.i32_mul ],
-      ...number(2, Valtype.i32),
+      ...number(4, Valtype.i32),
       [ Opcodes.i32_add ],
       [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
     ],
@@ -1067,6 +1067,8 @@ export const BuiltinFuncs = function() {
       [ Opcodes.local_get, 0 ],
       ...number(128, Valtype.i32),
       [ Opcodes.i32_mul ],
+      ...number(2, Valtype.i32),
+      [ Opcodes.i32_add ],
       [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
     ],
     table: true
@@ -1080,7 +1082,7 @@ export const BuiltinFuncs = function() {
       [ Opcodes.local_get, 0 ],
       ...number(128, Valtype.i32),
       [ Opcodes.i32_mul ],
-      ...number(3, Valtype.i32),
+      ...number(5, Valtype.i32),
       [ Opcodes.i32_add ],
       ...number(allocPage(scope, 'func lut') * pageSize, Valtype.i32),
       [ Opcodes.i32_add ]