porffor 0.24.12 → 0.24.14

package/compiler/assemble.js

@@ -114,11 +114,6 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
           params.push(valtypeBinary, Valtype.i32);
         }
 
-        if (inst.at(-1) === 'constr') {
-          inst.pop();
-          params.unshift(Valtype.i32);
-        }
-
         let returns = [ valtypeBinary, Valtype.i32 ];
         if (inst.at(-1) === 'no_type_return') {
           inst.pop();
@@ -172,8 +167,9 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       const func = funcs[i];
       let name = func.name;
 
-      const typedParams = !func.internal || func.typedParams;
-      let argc = Math.floor(typedParams ? func.params.length / 2 : func.params.length);
+      let argc = func.params.length;
+      if (func.constr) argc -= 4;
+      if (!func.internal || func.typedParams) argc = Math.floor(argc / 2);
 
       // hack: argc-- for prototype methods to remove _this hack from count
       if (name.includes('_prototype_')) argc--;
@@ -181,7 +177,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
       bytes.push(argc % 256, (argc / 256 | 0) % 256);
 
       let flags = 0b00000000; // 8 flag bits
-      if (func.returnType != null) flags |= 0b1;
+      if (func.returnType != null) flags |= 0b01;
       if (func.constr) flags |= 0b10;
       bytes.push(flags);
 

package/compiler/builtins/_internal_object.ts

@@ -198,10 +198,24 @@ i32.const 128
 return`;
     }
 
-    Porffor.wasm`
+    const funcFlags: i32 = Porffor.funcLut.flags(get);
+    if (funcFlags & 0b10) {
+      // constructor func, add new.target, this args
+      Porffor.wasm`
+f64.const 0
+i32.const 0
+local.get ${_this}
+f64.convert_i32_u
+local.get ${_this+1}
+local.get ${get}
+call_indirect 2 0
+return`;
+    } else {
+      Porffor.wasm`
 local.get ${get}
 call_indirect 0 0
 return`;
+    }
   }
 
   // data descriptor
@@ -262,11 +276,26 @@ export const __Porffor_object_set = (_this: object, key: any, value: any): any =
         return value;
       }
 
+      const funcFlags: i32 = Porffor.funcLut.flags(set);
+    if (funcFlags & 0b10) {
+      // constructor func, add new.target, this args
+      Porffor.wasm`
+f64.const 0
+i32.const 0
+local.get ${_this}
+f64.convert_i32_u
+i32.const 7
+local.get ${value}
+local.get ${value+1}
+local.get ${set}
+call_indirect 3 0`;
+    } else {
       Porffor.wasm`
 local.get ${value}
 local.get ${value+1}
 local.get ${set}
 call_indirect 1 0`;
+    }
 
       return value;
     }

package/compiler/builtins/arraybuffer.ts

@@ -1,6 +1,6 @@
 import type {} from './porffor.d.ts';
 
-export const __ArrayBuffer_isView = function (value: any): boolean {
+export const __ArrayBuffer_isView = (value: any): boolean => {
   if (value.buffer) return true;
   return false;
 };

package/compiler/builtins/console.ts

@@ -516,17 +516,17 @@ export const __Porffor_dirObject = (obj: any, colors: boolean, depth: i32, showH
 
   printStatic('{ ');
 
-  const keys = __Map_prototype_keys(obj);
+  const keys = __Object_keys(obj);
   const keysLen = keys.length - 1;
   for (let i = 0; i <= keysLen; i++) {
     const key = keys[i];
     __Porffor_consolePrint(key);
     printStatic(': ');
 
-    const value = __Map_prototype_get(obj, key);
+    const value = __Porffor_object_get(obj, key);
     __Porffor_dirObject(value, colors, depth - 1, showHidden);
 
-    if (i != keysLen) printStatic(',');
+    if (i != keysLen) printStatic(', ');
   }
 
   printStatic(' }');

package/compiler/builtins.js

@@ -1056,6 +1056,21 @@ export const BuiltinFuncs = function() {
     ]
   };
 
+  this.__Porffor_funcLut_flags = {
+    params: [ Valtype.i32 ],
+    returns: [ Valtype.i32 ],
+    returnType: TYPES.number,
+    wasm: (scope, { allocPage }) => [
+      [ Opcodes.local_get, 0 ],
+      ...number(128, Valtype.i32),
+      [ Opcodes.i32_mul ],
+      ...number(2, Valtype.i32),
+      [ Opcodes.i32_add ],
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize) ]
+    ],
+    table: true
+  };
+
   this.__Porffor_funcLut_length = {
     params: [ Valtype.i32 ],
     returns: [ Valtype.i32 ],

package/compiler/builtins_objects.js

@@ -189,6 +189,8 @@ export default function({ builtinFuncs }, Prefs) {
     });
   }
 
+  object('globalThis', {})
+
   if (Prefs.logMissingObjects) for (const x of Object.keys(builtinFuncs).concat(Object.keys(this))) {
     if (!x.startsWith('__')) continue;