porffor 0.55.32 → 0.55.34

package/compiler/builtins/z_ecma262.ts

@@ -28,7 +28,7 @@ export const __ecma262_ToPrimitive_String = (input: any): any => {
 // 7.1.4 ToNumber (argument)
 // https://tc39.es/ecma262/#sec-tonumber
 export const __ecma262_ToNumber = (argument: unknown): number => {
-  const t: i32 = Porffor.rawType(argument);
+  const t: i32 = Porffor.type(argument);
 
   // 1. If argument is a Number, return argument.
   if (t == Porffor.TYPES.number) return argument;
@@ -73,12 +73,12 @@ export const __ecma262_ToNumeric = (value: unknown): number => {
   // 1. Let primValue be ? ToPrimitive(value, number).
   // only run ToPrimitive if pure object for perf
   let primValue: any = value;
-  if (Porffor.rawType(value) == Porffor.TYPES.object && Porffor.wasm`local.get ${value}` != 0)
+  if (Porffor.type(value) == Porffor.TYPES.object && Porffor.wasm`local.get ${value}` != 0)
     primValue = __ecma262_ToPrimitive_Number(value);
 
   // 2. If primValue is a BigInt, return primValue.
   if (Porffor.comptime.flag`hasType.bigint`) {
-    if (Porffor.rawType(primValue) == Porffor.TYPES.bigint) return primValue;
+    if (Porffor.type(primValue) == Porffor.TYPES.bigint) return primValue;
   }
 
   // 3. Return ? ToNumber(primValue).
@@ -124,7 +124,7 @@ export const __ecma262_ToIndex = (value: unknown): number => {
 // 7.1.17 ToString (argument)
 // https://tc39.es/ecma262/#sec-tostring
 export const __ecma262_ToString = (argument: unknown): any => {
-  const type: i32 = Porffor.rawType(argument);
+  const type: i32 = Porffor.type(argument);
 
   // 1. If argument is a String, return argument.
   if (Porffor.fastOr(
@@ -180,11 +180,11 @@ export const __ecma262_ToPropertyKey = (argument: any): any => {
   // 1. Let key be ? ToPrimitive(argument, string).
   // only run ToPrimitive if pure object for perf
   let key: any = argument;
-  if (Porffor.rawType(argument) == Porffor.TYPES.object && Porffor.wasm`local.get ${argument}` != 0)
+  if (Porffor.type(argument) == Porffor.TYPES.object && Porffor.wasm`local.get ${argument}` != 0)
     key = __ecma262_ToPrimitive_String(argument);
 
   // 2. If key is a Symbol, then
-  if (Porffor.rawType(key) == Porffor.TYPES.symbol) {
+  if (Porffor.type(key) == Porffor.TYPES.symbol) {
     // a. Return key.
     return key;
   }
@@ -194,6 +194,6 @@ export const __ecma262_ToPropertyKey = (argument: any): any => {
 };
 
 export const __ecma262_IsConstructor = (argument: any): boolean => {
-  if (Porffor.rawType(argument) != Porffor.TYPES.function) return false;
+  if (Porffor.type(argument) != Porffor.TYPES.function) return false;
   return (__Porffor_funcLut_flags(argument) & 0b10) == 2;
 };

package/compiler/builtins.js

@@ -735,19 +735,18 @@ export const BuiltinFuncs = function() {
   this.__performance_now.usesImports = true;
 
 
-  this.__Porffor_type = {
-    params: [ valtypeBinary, Valtype.i32 ],
-    typedParams: true,
-    locals: [ Valtype.i32, Valtype.i32 ],
+  this.__Porffor_typeName = {
+    params: [ Valtype.i32 ],
+    locals: [],
     returns: [ valtypeBinary ],
     returnType: TYPES.bytestring,
     wasm: (scope, { typeSwitch, makeString }) => {
       const bc = {};
       for (const x in TYPE_NAMES) {
-        bc[x] = makeString(scope, TYPE_NAMES[x]);
+        bc[x] = () => makeString(scope, TYPE_NAMES[x]);
       }
 
-      return typeSwitch(scope, [ [ Opcodes.local_get, 1 ] ], bc);
+      return typeSwitch(scope, [ [ Opcodes.local_get, 0 ] ], bc);
     }
   };
 

package/compiler/builtins_objects.js

@@ -15,7 +15,7 @@ export default function({ builtinFuncs }, Prefs) {
 
     builtinFuncs['#get_' + name] = {
       params: [],
-      locals: [],
+      locals: [ Valtype.i32 ],
       returns: [ Valtype.i32 ],
       returnType: TYPES.object,
       wasm: (scope, { allocPage, makeString, generate, getNodeType, builtin, funcRef, glbl }) => {
@@ -41,7 +41,15 @@ export default function({ builtinFuncs }, Prefs) {
 
           // set cache & ptr for use
           number(ptr, Valtype.i32),
-          glbl(Opcodes.global_set, `getptr_${name}`, Valtype.i32)[0]
+          [ Opcodes.local_tee, 0 ],
+          glbl(Opcodes.global_set, `getptr_${name}`, Valtype.i32)[0],
+
+          [ Opcodes.local_get, 0 ],
+          Opcodes.i32_from_u,
+          number(existingFunc ? TYPES.function : TYPES.object, Valtype.i32),
+          [ Opcodes.call, builtin('__Porffor_object_underlying') ],
+          [ Opcodes.drop ],
+          [ Opcodes.local_set, 0 ]
         ];
 
         for (const x in props) {
@@ -50,6 +58,20 @@ export default function({ builtinFuncs }, Prefs) {
             name: prefix + x
           };
 
+          if (x === '__proto__') {
+            out.push(
+              [ Opcodes.local_get, 0 ],
+              number(TYPES.object, Valtype.i32),
+
+              ...generate(scope, value),
+              Opcodes.i32_to_u,
+              ...getNodeType(scope, value),
+
+              [ Opcodes.call, builtin('__Porffor_object_setPrototype') ]
+            );
+            continue;
+          }
+
           let flags = 0b0000;
 
           const d = props[x];
@@ -61,8 +83,8 @@ export default function({ builtinFuncs }, Prefs) {
           if (this[prefix + x]?.type === TYPES.object && this[prefix + x] !== this.null) value = { type: 'ObjectExpression', properties: [] };
 
           out.push(
-            getPtr,
-            number(existingFunc ? TYPES.function : TYPES.object, Valtype.i32),
+            [ Opcodes.local_get, 0 ],
+            number(TYPES.object, Valtype.i32),
 
             ...makeString(scope, x),
             Opcodes.i32_to_u,
@@ -74,7 +96,7 @@ export default function({ builtinFuncs }, Prefs) {
             number(flags, Valtype.i32),
             number(TYPES.number, Valtype.i32),
 
-            [ Opcodes.call, builtin('__Porffor_object_expr_initWithFlags') ]
+            [ Opcodes.call, builtin('__Porffor_object_fastAdd') ]
           );
         }