porffor 0.19.5 → 0.19.7

package/compiler/builtins/z_map.ts

@@ -13,10 +13,13 @@ export const __Map_prototype_get = (_this: Map, key: any) => {
   const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
   const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const keyIdx: i32 = Porffor.set.indexOf(keys, key);
-  if (keyIdx == -1) return undefined;
+  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
+
+  for (let i: i32 = 0; i < size; i++) {
+    if (Porffor.set.read(keys, i) === key) return vals[i];
+  }
 
-  return vals[keyIdx];
+  return undefined;
 };
 
 export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
@@ -25,30 +28,42 @@ export const __Map_prototype_set = (_this: Map, key: any, value: any) => {
 
   const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
 
-  let keyIdx: i32 = Porffor.set.indexOf(keys, key);
-  if (keyIdx == -1) {
-    // add key if non-existent
-    keyIdx = size;
-    __Set_prototype_add(keys, key);
+  for (let i: i32 = 0; i < size; i++) {
+    if (Porffor.set.read(keys, i) === key) {
+      vals[i] = value;
+      return _this;
+    }
   }
 
-  vals[keyIdx] = value;
+  // add key if non-existent
+  // increment size by 1
+  Porffor.wasm.i32.store(keys, size + 1, 0, 0);
+
+  // write new key at end
+  __Porffor_set_write(keys, size, key);
+
+  // write new value at end
+  vals[size] = value;
 
   return _this;
 };
 
 export const __Map_prototype_delete = (_this: Map, key: any) => {
   const keys: Set = Porffor.wasm.i32.load(_this, 0, 0);
+  const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
 
-  const keyIdx = Porffor.set.indexOf(keys, key);
-  if (keyIdx == -1) return false;
+  const size: i32 = Porffor.wasm.i32.load(keys, 0, 0);
 
-  __Set_prototype_delete(keys, key);
+  for (let i: i32 = 0; i < size; i++) {
+    if (Porffor.set.read(keys, i) === key) {
+      __Set_prototype_delete(keys, key);
+      __Array_prototype_splice(vals, i, 1);
 
-  const vals: any[] = Porffor.wasm.i32.load(_this, 0, 4);
-  __Array_prototype_splice(vals, keyIdx, 1);
+      return true;
+    }
+  }
 
-  return true;
+  return false;
 };
 
 export const __Map_prototype_clear = (_this: Map) => {

package/compiler/codegen.js

@@ -1231,12 +1231,7 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
   return func;
 };
 
-const includeBuiltin = (scope, builtin) => {
-  const code = builtinFuncs[builtin];
-  if (code.wasm) return asmFunc(builtin, code);
-
-  return code.body.map(x => generate(scope, x));
-};
+const includeBuiltin = (scope, builtin) => asmFunc(builtin, builtinFuncs[builtin]);
 
 const generateLogicExp = (scope, decl) => {
   return performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
@@ -1341,6 +1336,10 @@ const getNodeType = (scope, node) => {
       return getType(scope, node.name);
     }
 
+    if (node.type === 'ObjectExpression') {
+      return TYPES.object;
+    }
+
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
       if (!name) {
@@ -1926,7 +1925,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   // TODO: only allows callee as identifier
-  if (!name) return todo(scope, `only identifier callees (got ${decl.callee.type})`);
+  // if (!name) return todo(scope, `only identifier callees (got ${decl.callee.type})`);
 
   let idx = funcIndex[name] ?? importedFuncs[name];
   if (idx === undefined && builtinFuncs[name]) {
@@ -1942,7 +1941,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     return internalConstrs[name].generate(scope, decl, _global, _name);
   }
 
-  if (idx === undefined && !decl._new && name.startsWith('__Porffor_wasm_')) {
+  if (idx === undefined && !decl._new && name && name.startsWith('__Porffor_wasm_')) {
     const wasmOps = {
       // pointer, align, offset
       i32_load: { imms: 2, args: [ true ], returns: 1 },
@@ -1989,162 +1988,171 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   if (idx === undefined) {
-    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) {
-      const [ local, global ] = lookupName(scope, name);
-      if (!Prefs.indirectCalls || local == null) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
+    if (!Prefs.indirectCalls) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
 
-      // todo: only works when function uses typedParams and typedReturns
+    // todo: only works when function uses typedParams and typedReturns
 
-      const indirectMode = Prefs.indirectCallMode ?? 'vararg';
-      // options: vararg, strict
-      // - strict: simpler, smaller size usage, no func lut needed.
-      //   ONLY works when arg count of call == arg count of function being called
-      // - vararg: large size usage, cursed.
-      //   works when arg count of call != arg count of function being called*
-      //   * most of the time, some edgecases
+    const indirectMode = Prefs.indirectCallMode ?? 'vararg';
+    // options: vararg, strict
+    // - strict: simpler, smaller size usage, no func lut needed.
+    //   ONLY works when arg count of call == arg count of function being called
+    // - vararg: large size usage, cursed.
+    //   works when arg count of call != arg count of function being called*
+    //   * most of the time, some edgecases
 
-      funcs.table = true;
-      scope.table = true;
+    funcs.table = true;
+    scope.table = true;
 
-      let args = decl.arguments;
-      let locals = [];
+    let args = decl.arguments;
+    let locals = [];
 
-      if (indirectMode === 'vararg') {
-        const minArgc = Prefs.indirectCallMinArgc ?? 3;
+    if (indirectMode === 'vararg') {
+      const minArgc = Prefs.indirectCallMinArgc ?? 3;
 
-        if (args.length < minArgc) {
-          args = args.concat(new Array(minArgc - args.length).fill(DEFAULT_VALUE));
-        }
+      if (args.length < minArgc) {
+        args = args.concat(new Array(minArgc - args.length).fill(DEFAULT_VALUE));
       }
+    }
 
-      for (let i = 0; i < args.length; i++) {
-        const arg = args[i];
-        out = out.concat(generate(scope, arg));
+    for (let i = 0; i < args.length; i++) {
+      const arg = args[i];
+      out = out.concat(generate(scope, arg));
 
-        if (valtypeBinary !== Valtype.i32 && (
-          (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32) ||
-          (importedFuncs[name] && name.startsWith('profile'))
-        )) {
-          out.push(Opcodes.i32_to);
-        }
+      if (valtypeBinary !== Valtype.i32 && (
+        (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32) ||
+        (importedFuncs[name] && name.startsWith('profile'))
+      )) {
+        out.push(Opcodes.i32_to);
+      }
 
-        out = out.concat(getNodeType(scope, arg));
+      out = out.concat(getNodeType(scope, arg));
 
-        if (indirectMode === 'vararg') {
-          const typeLocal = localTmp(scope, `#indirect_arg${i}_type`, Valtype.i32);
-          const valLocal = localTmp(scope, `#indirect_arg${i}_val`);
+      if (indirectMode === 'vararg') {
+        const typeLocal = localTmp(scope, `#indirect_arg${i}_type`, Valtype.i32);
+        const valLocal = localTmp(scope, `#indirect_arg${i}_val`);
 
-          locals.push([valLocal, typeLocal]);
+        locals.push([valLocal, typeLocal]);
 
-          out.push(
-            [ Opcodes.local_set, typeLocal ],
-            [ Opcodes.local_set, valLocal ]
-          );
-        }
+        out.push(
+          [ Opcodes.local_set, typeLocal ],
+          [ Opcodes.local_set, valLocal ]
+        );
       }
+    }
+
+    if (indirectMode === 'strict') {
+      return [
+        ...generate(scope, decl.callee),
+        [ Opcodes.local_set, localTmp(scope, '#indirect_callee') ],
 
-      if (indirectMode === 'strict') {
-        return typeSwitch(scope, getNodeType(scope, decl.callee), {
+        ...typeSwitch(scope, getNodeType(scope, decl.callee), {
           [TYPES.function]: [
             ...out,
-            [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+
+            [ Opcodes.local_get, localTmp(scope, '#indirect_callee') ],
+            ...generate(scope, decl.callee),
             Opcodes.i32_to_u,
             [ Opcodes.call_indirect, args.length, 0 ],
             ...setLastType(scope)
           ],
           default: internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true)
-        });
+        })
+      ];
+    }
+
+    // hi, I will now explain how vararg mode works:
+    // wasm's indirect_call instruction requires you know the func type at compile-time
+    // since we have varargs (variable argument count), we do not know it.
+    // we could just store args in memory and not use wasm func args,
+    // but that is slow (probably) and breaks js exports.
+    // instead, we generate every* possibility of argc and use different indirect_call
+    // ops for each one, with type depending on argc for that branch.
+    // then we load the argc for the wanted function from a memory lut,
+    // and call the branch with the matching argc we require.
+    // sorry, yes it is very cursed (and size inefficient), but indirect calls
+    // are kind of rare anyway (mostly callbacks) so I am not concerned atm.
+    // *for argc 0-3, in future (todo:) the max number should be
+    // dynamically changed to the max argc of any func in the js file.
+
+    const funcLocal = localTmp(scope, '#indirect_func', Valtype.i32);
+    const flags = localTmp(scope, '#indirect_flags', Valtype.i32);
+
+    const gen = argc => {
+      const argsOut = [];
+      for (let i = 0; i < argc; i++) {
+        argsOut.push(
+          [ Opcodes.local_get, locals[i][0] ],
+          [ Opcodes.local_get, locals[i][1] ]
+        );
       }
 
-      // hi, I will now explain how vararg mode works:
-      // wasm's indirect_call instruction requires you know the func type at compile-time
-      // since we have varargs (variable argument count), we do not know it.
-      // we could just store args in memory and not use wasm func args,
-      // but that is slow (probably) and breaks js exports.
-      // instead, we generate every* possibility of argc and use different indirect_call
-      // ops for each one, with type depending on argc for that branch.
-      // then we load the argc for the wanted function from a memory lut,
-      // and call the branch with the matching argc we require.
-      // sorry, yes it is very cursed (and size inefficient), but indirect calls
-      // are kind of rare anyway (mostly callbacks) so I am not concerned atm.
-      // *for argc 0-3, in future (todo:) the max number should be
-      // dynamically changed to the max argc of any func in the js file.
-
-      const funcLocal = localTmp(scope, '#indirect_func', Valtype.i32);
-      const flags = localTmp(scope, '#indirect_flags', Valtype.i32);
-
-      const gen = argc => {
-        const argsOut = [];
-        for (let i = 0; i < argc; i++) {
-          argsOut.push(
-            [ Opcodes.local_get, locals[i][0] ],
-            [ Opcodes.local_get, locals[i][1] ]
-          );
-        }
+      const checkFlag = (flag, pass, fail) => [
+        [ Opcodes.local_get, flags ],
+        ...number(flag, Valtype.i32),
+        [ Opcodes.i32_and ],
+        [ Opcodes.if, valtypeBinary ],
+        ...pass,
+        [ Opcodes.else ],
+        ...fail,
+        [ Opcodes.end ]
+      ];
 
-        const checkFlag = (flag, pass, fail) => [
-          [ Opcodes.local_get, flags ],
-          ...number(flag, Valtype.i32),
-          [ Opcodes.i32_and ],
-          [ Opcodes.if, valtypeBinary ],
-          ...pass,
-          [ Opcodes.else ],
-          ...fail,
-          [ Opcodes.end ]
-        ];
+      // pain.
+      // return checkFlag(0b10, [ // constr
+      //   [ Opcodes.i32_const, decl._new ? 1 : 0 ],
+      //   ...argsOut,
+      //   [ Opcodes.local_get, funcLocal ],
+      //   [ Opcodes.call_indirect, argc, 0, 'constr' ],
+      //   ...setLastType(scope),
+      // ], [
+      //   ...argsOut,
+      //   [ Opcodes.local_get, funcLocal ],
+      //   [ Opcodes.call_indirect, argc, 0 ],
+      //   ...setLastType(scope),
+      // ]);
+
+      return checkFlag(0b1, // no type return
+        checkFlag(0b10, [ // no type return & constr
+          [ Opcodes.i32_const, decl._new ? 1 : 0 ],
+          ...argsOut,
+          [ Opcodes.local_get, funcLocal ],
+          [ Opcodes.call_indirect, argc, 0, 'no_type_return', 'constr' ],
+        ], [
+          ...argsOut,
+          [ Opcodes.local_get, funcLocal ],
+          [ Opcodes.call_indirect, argc, 0, 'no_type_return' ]
+        ]),
+        checkFlag(0b10, [ // type return & constr
+          [ Opcodes.i32_const, decl._new ? 1 : 0 ],
+          ...argsOut,
+          [ Opcodes.local_get, funcLocal ],
+          [ Opcodes.call_indirect, argc, 0, 'constr' ],
+          ...setLastType(scope),
+        ], [
+          ...argsOut,
+          [ Opcodes.local_get, funcLocal ],
+          [ Opcodes.call_indirect, argc, 0 ],
+          ...setLastType(scope),
+        ]),
+      );
+    };
 
-        // pain.
-        // return checkFlag(0b10, [ // constr
-        //   [ Opcodes.i32_const, decl._new ? 1 : 0 ],
-        //   ...argsOut,
-        //   [ Opcodes.local_get, funcLocal ],
-        //   [ Opcodes.call_indirect, argc, 0, 'constr' ],
-        //   ...setLastType(scope),
-        // ], [
-        //   ...argsOut,
-        //   [ Opcodes.local_get, funcLocal ],
-        //   [ Opcodes.call_indirect, argc, 0 ],
-        //   ...setLastType(scope),
-        // ]);
-
-        return checkFlag(0b1, // no type return
-          checkFlag(0b10, [ // no type return & constr
-            [ Opcodes.i32_const, decl._new ? 1 : 0 ],
-            ...argsOut,
-            [ Opcodes.local_get, funcLocal ],
-            [ Opcodes.call_indirect, argc, 0, 'no_type_return', 'constr' ],
-          ], [
-            ...argsOut,
-            [ Opcodes.local_get, funcLocal ],
-            [ Opcodes.call_indirect, argc, 0, 'no_type_return' ]
-          ]),
-          checkFlag(0b10, [ // type return & constr
-            [ Opcodes.i32_const, decl._new ? 1 : 0 ],
-            ...argsOut,
-            [ Opcodes.local_get, funcLocal ],
-            [ Opcodes.call_indirect, argc, 0, 'constr' ],
-            ...setLastType(scope),
-          ], [
-            ...argsOut,
-            [ Opcodes.local_get, funcLocal ],
-            [ Opcodes.call_indirect, argc, 0 ],
-            ...setLastType(scope),
-          ]),
-        );
-      };
+    const tableBc = {};
+    for (let i = 0; i <= args.length; i++) {
+      tableBc[i] = gen(i);
+    }
 
-      const tableBc = {};
-      for (let i = 0; i <= args.length; i++) {
-        tableBc[i] = gen(i);
-      }
+    // todo/perf: check if we should use br_table here or just generate our own big if..elses
 
-      // todo/perf: check if we should use br_table here or just generate our own big if..elses
+    return [
+      ...generate(scope, decl.callee),
+      [ Opcodes.local_set, localTmp(scope, '#indirect_callee') ],
 
-      return typeSwitch(scope, getNodeType(scope, decl.callee), {
+      ...typeSwitch(scope, getNodeType(scope, decl.callee), {
         [TYPES.function]: [
           ...out,
 
-          [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+          [ Opcodes.local_get, localTmp(scope, '#indirect_callee') ],
           Opcodes.i32_to_u,
           [ Opcodes.local_set, funcLocal ],
 
@@ -2177,10 +2185,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ], tableBc, valtypeBinary)
         ],
         default: internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true)
-      });
-    }
-
-    return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
+      })
+    ];
   }
 
   const func = funcs[idx - importedFuncs.length]; // idx === scope.index ? scope : funcs.find(x => x.index === idx);
@@ -2296,6 +2302,8 @@ const codeToSanitizedStr = code => {
 const sanitize = str => str.replace(/[^0-9a-zA-Z_]/g, _ => codeToSanitizedStr(_.charCodeAt(0)));
 
 const unhackName = name => {
+  if (!name) return name;
+
   if (name.startsWith('__')) return name.slice(2).replaceAll('_', '.');
   return name;
 };
@@ -2702,22 +2710,22 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
   const [ local, isGlobal ] = lookupName(scope, name);
 
-  if (isFuncType(decl.right.type)) {
-    // hack for a = function () { ... }
-    decl.right.id = { name };
+  // if (isFuncType(decl.right.type)) {
+  //   // hack for a = function () { ... }
+  //   decl.right.id = { name };
 
-    const func = generateFunc(scope, decl.right);
+  //   const func = generateFunc(scope, decl.right);
 
-    return [
-      ...number(func.index - importedFuncs.length),
-      ...(local != null ? [
-        [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-        [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+  //   return [
+  //     ...number(func.index - importedFuncs.length),
+  //     ...(local != null ? [
+  //       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+  //       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
 
-        ...setType(scope, name, TYPES.function)
-      ] : [])
-    ];
-  }
+  //       ...setType(scope, name, TYPES.function)
+  //     ] : [])
+  //   ];
+  // }
 
   const op = decl.operator.slice(0, -1) || '=';
 
@@ -2746,18 +2754,27 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   }
 
   // arr[i]
-  if (decl.left.type === 'MemberExpression' && decl.left.computed) {
+  if (decl.left.type === 'MemberExpression') {
     const newValueTmp = localTmp(scope, '#member_setter_val_tmp');
     const pointerTmp = localTmp(scope, '#member_setter_ptr_tmp', Valtype.i32);
 
+    const object = decl.left.object;
+    const property = decl.left.computed ? decl.left.property : {
+      type: 'Literal',
+      value: decl.left.property.name
+    };
+
+    includeBuiltin(scope, '__Map_prototype_get');
+    includeBuiltin(scope, '__Map_prototype_set');
+
     return [
       ...typeSwitch(scope, getNodeType(scope, decl.left.object), {
         [TYPES.array]: [
-          ...generate(scope, decl.left.object),
+          ...generate(scope, object),
           Opcodes.i32_to_u,
 
           // get index as valtype
-          ...generate(scope, decl.left.property),
+          ...generate(scope, property),
           Opcodes.i32_to_u,
 
           // turn into byte offset by * valtypeSize + 1
@@ -2781,6 +2798,34 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
         ],
 
+        [TYPES.object]: [
+          ...generate(scope, object),
+          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_object') ] ]),
+          ...getNodeType(scope, object),
+
+          ...generate(scope, property),
+          ...(op === '=' ? [] : [ [ Opcodes.local_tee, localTmp(scope, '#objset_property') ] ]),
+          ...getNodeType(scope, property),
+
+          ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
+            [ Opcodes.local_get, localTmp(scope, '#objset_object') ],
+            ...getNodeType(scope, object),
+
+            [ Opcodes.local_get, localTmp(scope, '#objset_property') ],
+            ...getNodeType(scope, property),
+
+            [ Opcodes.call, funcIndex.__Map_prototype_get ],
+            ...setLastType(scope)
+          ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
+          [ Opcodes.local_tee, newValueTmp ],
+          ...getNodeType(scope, decl),
+
+          [ Opcodes.call, funcIndex.__Map_prototype_set ],
+          [ Opcodes.drop ],
+
+          ...setLastType(scope, getNodeType(scope, decl)),
+        ],
+
         ...wrapBC({
           [TYPES.uint8array]: [
             [ Opcodes.i32_add ],
@@ -2924,11 +2969,11 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ],
         }, {
           prelude: [
-            ...generate(scope, decl.left.object),
+            ...generate(scope, object),
             Opcodes.i32_to_u,
             [ Opcodes.i32_load, 0, 4 ],
 
-            ...generate(scope, decl.left.property),
+            ...generate(scope, property),
             Opcodes.i32_to_u,
           ],
           postlude: setLastType(scope, TYPES.number)
@@ -2957,7 +3002,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     // set global and return (eg a = 2)
     return [
       ...generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name }, init: decl.right } ] }),
-      [ Opcodes.global_get, globals[name].idx ]
+      ...generate(scope, decl.left)
     ];
   }
 
@@ -4193,12 +4238,50 @@ const generateArray = (scope, decl, global = false, name = '$undeclared', initEm
 };
 
 const generateObject = (scope, decl, global = false, name = '$undeclared') => {
-  if (decl.properties.length > 0) return todo(scope, 'objects are not supported yet', true);
+  includeBuiltin(scope, 'Map');
+  includeBuiltin(scope, '__Map_prototype_set');
 
-  return [
-    ...number(1),
-    ...setLastType(scope, TYPES.object)
+  // todo: optimize const objects
+  const tmp = localTmp(scope, `#objectexpr${randId()}`);
+  const out = [
+    ...generateCall(scope, {
+      callee: {
+        type: 'Identifier',
+        name: 'Map'
+      },
+      arguments: [],
+      _new: true
+    }),
+    [ Opcodes.local_tee, tmp ]
   ];
+
+  for (const x of decl.properties) {
+    const { method, shorthand, computed, kind, key, value } = x;
+    if (kind !== 'init') return todo(scope, 'complex objects are not supported yet', true);
+
+    const k = computed ? key : {
+      type: 'Literal',
+      value: key.name
+    };
+
+    out.push(
+      [ Opcodes.local_get, tmp ],
+      ...number(TYPES.map, Valtype.i32),
+
+      ...generate(scope, k),
+      ...getNodeType(scope, k),
+
+      ...generate(scope, value),
+      ...getNodeType(scope, value),
+
+      [ Opcodes.call, funcIndex.__Map_prototype_set ],
+
+      [ Opcodes.drop ],
+      [ Opcodes.drop ]
+    );
+  }
+
+  return out;
 };
 
 const withType = (scope, wasm, type) => [
@@ -4323,14 +4406,19 @@ const generateMember = (scope, decl, _global, _name) => {
     }, valtypeBinary);
   }
 
-  const object = generate(scope, decl.object);
-  const property = generate(scope, decl.property);
+  const object = decl.object;
+  const objectWasm = generate(scope, object);
+  const property = decl.computed ? decl.property : {
+    type: 'Literal',
+    value: decl.property.name
+  };
+  const propertyWasm = generate(scope, property);
 
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
   let newOut = number(0, Valtype.i32), newPointer = number(0, Valtype.i32);
 
-  const known = knownType(scope, getNodeType(scope, decl.object));
+  const known = knownType(scope, getNodeType(scope, object));
   if ((known === TYPES.string || known === TYPES.bytestring) || (pages.hasAnyString && known == null)) {
     // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
     0, [ newOut, newPointer ] = makeArray(scope, {
@@ -4338,11 +4426,14 @@ const generateMember = (scope, decl, _global, _name) => {
     }, _global, _name, true, 'i16', true);
   }
 
-  return typeSwitch(scope, getNodeType(scope, decl.object), {
+  includeBuiltin(scope, '__Map_prototype_get');
+
+  return typeSwitch(scope, getNodeType(scope, object), {
     [TYPES.array]: [
-      ...loadArray(scope, object, property),
+      ...loadArray(scope, objectWasm, propertyWasm),
       ...setLastType(scope)
     ],
+
     [TYPES.string]: [
       // setup new/out array
       ...newOut,
@@ -4354,13 +4445,13 @@ const generateMember = (scope, decl, _global, _name) => {
       // use as pointer for store later
       ...newPointer,
 
-      ...property,
+      ...propertyWasm,
       Opcodes.i32_to_u,
 
       ...number(ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
 
-      ...object,
+      ...objectWasm,
       Opcodes.i32_to_u,
       [ Opcodes.i32_add ],
 
@@ -4375,6 +4466,7 @@ const generateMember = (scope, decl, _global, _name) => {
       Opcodes.i32_from_u,
       ...setLastType(scope, TYPES.string)
     ],
+
     [TYPES.bytestring]: [
       // setup new/out array
       ...newOut,
@@ -4386,10 +4478,10 @@ const generateMember = (scope, decl, _global, _name) => {
       // use as pointer for store later
       ...newPointer,
 
-      ...property,
+      ...propertyWasm,
       Opcodes.i32_to_u,
 
-      ...object,
+      ...objectWasm,
       Opcodes.i32_to_u,
       [ Opcodes.i32_add ],
 
@@ -4405,6 +4497,17 @@ const generateMember = (scope, decl, _global, _name) => {
       ...setLastType(scope, TYPES.bytestring)
     ],
 
+    [TYPES.object]: [
+      ...objectWasm,
+      ...getNodeType(scope, object),
+
+      ...propertyWasm,
+      ...getNodeType(scope, property),
+
+      [ Opcodes.call, funcIndex.__Map_prototype_get ],
+      ...setLastType(scope)
+    ],
+
     ...wrapBC({
       [TYPES.uint8array]: [
         [ Opcodes.i32_add ],
@@ -4473,22 +4576,23 @@ const generateMember = (scope, decl, _global, _name) => {
       ],
     }, {
       prelude: [
-        ...object,
+        ...objectWasm,
         Opcodes.i32_to_u,
         [ Opcodes.i32_load, 0, 4 ],
 
-        ...property,
+        ...propertyWasm,
         Opcodes.i32_to_u
       ],
       postlude: setLastType(scope, TYPES.number)
     }),
 
-    default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
+    default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
   });
 };
 
 const randId = () => Math.random().toString(16).slice(1, -2).padEnd(12, '0');
 
+let objectHackers = [];
 const objectHack = node => {
   if (!node) return node;
 
@@ -4503,16 +4607,10 @@ const objectHack = node => {
       if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
 
       if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
-
-      // if .name or .length, give up (hack within a hack!)
-      if (['name', 'length', 'size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength'].includes(node.property.name)) {
-        node.object = objectHack(node.object);
+      if (!objectName || (!objectHackers.includes(objectName) && !objectHackers.some(x => objectName.startsWith(`${x}_`)))) {
         return;
       }
 
-      // no object name, give up
-      if (!objectName) return;
-
       const name = '__' + objectName + '_' + node.property.name;
       if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 
@@ -4861,6 +4959,9 @@ export default program => {
   prototypeFuncs = new PrototypeFuncs();
   allocator = makeAllocator(Prefs.allocator ?? 'static');
 
+  const getObjectName = x => x.startsWith('__') && x.slice(2, x.indexOf('_', 2));
+  objectHackers = ['assert', 'compareArray', 'Test262Error', ...new Set(Object.keys(builtinFuncs).map(getObjectName).concat(Object.keys(builtinVars).map(getObjectName)).filter(x => x))];
+
   program.id = { name: 'main' };
 
   const scope = {

package/compiler/generated_builtins.js

@@ -4004,22 +4004,22 @@ export const BuiltinFuncs = function() {
     locals: [124,127], localNames: ["_this","_this#type","key","key#type","keys","#last_type"],
   };
   this.__Map_prototype_get = {
-    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,4],[32,0],[252,2],[40,0,4],[183],[33,5],[32,4],[65,19],[32,2],[32,3],[16, builtin('__Porffor_set_indexOf')],[33,7],[34,6],[68,0,0,0,0,0,0,240,191],[97],[4,64],[68,0,0,0,0,0,0,0,0],[65,128,1],[15],[11],[32,6],[252,3],[65,9],[108],[32,5],[252,3],[106],[34,8],[43,0,4],[32,8],[45,0,12],[34,7],[15]],
+    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,4],[32,0],[252,2],[40,0,4],[183],[33,5],[32,4],[252,2],[40,0,0],[183],[33,6],[68,0,0,0,0,0,0,0,0],[33,7],[3,64],[32,7],[32,6],[99],[4,64],[2,64],[2,127,"string_only"],[32,4],[65,19],[32,7],[65,1],[16, builtin('__Porffor_set_read')],[33,8],[34,9,"string_only"],[32,2],[34,10,"string_only"],[32,8,"string_only|start"],[65,195,1],[70],[32,3],[65,195,1],[70],[113],[4,64],[32,9],[252,3],[34,11],[32,10],[252,3],[34,13],[71],[4,127],[32,11],[40,0,0],[34,12],[32,13],[40,0,0],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,14],[32,12],[33,15],[3,64],[32,14],[32,11],[106],[45,0,4],[32,14],[32,13],[106],[45,0,4],[71],[4,64],[65,0],[12,2],[11],[32,14],[65,1],[106],[34,14],[32,15],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11],[32,8],[65,195,0],[70],[32,8],[65,195,1],[70],[114],[32,3],[65,195,0],[70],[32,3],[65,195,1],[70],[114],[114],[4,64],[32,9],[252,3],[34,11],[32,10],[252,3],[34,13],[71],[4,127],[32,11],[40,0,0],[34,12],[32,13],[40,0,0],[32,8],[65,195,1],[70],[4,64],[32,11],[32,12],[16, builtin('__Porffor_bytestringToString')],[33,11],[11],[32,3],[65,195,1],[70],[4,64],[32,13],[32,13],[40,0,0],[16, builtin('__Porffor_bytestringToString')],[33,13],[11],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,14],[32,12],[65,2],[108],[33,15],[3,64],[32,14],[32,11],[106],[47,0,4],[32,14],[32,13],[106],[47,0,4],[71],[4,64],[65,0],[12,2],[11],[32,14],[65,2],[106],[34,14],[32,15],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11,"string_only|end"],[97],[11,"string_only"],[32,8],[65,128,1],[114],[32,3],[65,128,1],[114],[70],[113],[4,64],[32,7],[252,3],[65,9],[108],[32,5],[252,3],[106],[34,16],[43,0,4],[32,16],[45,0,12],[34,8],[15],[11],[11],[32,7],[68,0,0,0,0,0,0,240,63],[160],[33,7],[12,1],[11],[11],[68,0,0,0,0,0,0,0,0],[65,128,1],[15]],
     params: [124,127,124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
-    locals: [124,124,124,127,127], localNames: ["_this","_this#type","key","key#type","keys","vals","keyIdx","#last_type","#loadArray_offset"],
+    locals: [124,124,124,124,127,124,124,127,127,127,127,127,127], localNames: ["_this","_this#type","key","key#type","keys","vals","size","i","#last_type","__tmpop_left","__tmpop_right","compare_left_pointer","compare_left_length","compare_right_pointer","compare_index","compare_index_end","#loadArray_offset"],
   };
   this.__Map_prototype_set = {
-    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,6],[32,0],[252,2],[40,0,4],[183],[33,7],[32,6],[252,2],[40,0,0],[183],[33,8],[32,6],[65,19],[32,2],[32,3],[16, builtin('__Porffor_set_indexOf')],[33,10],[34,9],[68,0,0,0,0,0,0,240,191],[97],[4,64],[32,8],[33,9],[32,6],[65,19],[32,2],[32,3],[16, builtin('__Set_prototype_add')],[33,10],[26],[11],[32,7],[252,3],[32,9],[252,3],[65,9],[108],[106],[34,12],[32,4],[34,11],[57,0,4],[32,12],[32,5],[58,0,12],[32,0],[65,20],[15]],
+    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,6],[32,0],[252,2],[40,0,4],[183],[33,7],[32,6],[252,2],[40,0,0],[183],[33,8],[68,0,0,0,0,0,0,0,0],[33,9],[3,64],[32,9],[32,8],[99],[4,64],[2,64],[2,127,"string_only"],[32,6],[65,19],[32,9],[65,1],[16, builtin('__Porffor_set_read')],[33,10],[34,11,"string_only"],[32,2],[34,12,"string_only"],[32,10,"string_only|start"],[65,195,1],[70],[32,3],[65,195,1],[70],[113],[4,64],[32,11],[252,3],[34,13],[32,12],[252,3],[34,15],[71],[4,127],[32,13],[40,0,0],[34,14],[32,15],[40,0,0],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,16],[32,14],[33,17],[3,64],[32,16],[32,13],[106],[45,0,4],[32,16],[32,15],[106],[45,0,4],[71],[4,64],[65,0],[12,2],[11],[32,16],[65,1],[106],[34,16],[32,17],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11],[32,10],[65,195,0],[70],[32,10],[65,195,1],[70],[114],[32,3],[65,195,0],[70],[32,3],[65,195,1],[70],[114],[114],[4,64],[32,11],[252,3],[34,13],[32,12],[252,3],[34,15],[71],[4,127],[32,13],[40,0,0],[34,14],[32,15],[40,0,0],[32,10],[65,195,1],[70],[4,64],[32,13],[32,14],[16, builtin('__Porffor_bytestringToString')],[33,13],[11],[32,3],[65,195,1],[70],[4,64],[32,15],[32,15],[40,0,0],[16, builtin('__Porffor_bytestringToString')],[33,15],[11],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,16],[32,14],[65,2],[108],[33,17],[3,64],[32,16],[32,13],[106],[47,0,4],[32,16],[32,15],[106],[47,0,4],[71],[4,64],[65,0],[12,2],[11],[32,16],[65,2],[106],[34,16],[32,17],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11,"string_only|end"],[97],[11,"string_only"],[32,10],[65,128,1],[114],[32,3],[65,128,1],[114],[70],[113],[4,64],[32,7],[252,3],[32,9],[252,3],[65,9],[108],[106],[34,19],[32,4],[34,18],[57,0,4],[32,19],[32,5],[58,0,12],[32,0],[65,20],[15],[11],[11],[32,9],[68,0,0,0,0,0,0,240,63],[160],[33,9],[12,1],[11],[11],[32,6],[252,2],[32,8],[68,0,0,0,0,0,0,240,63],[160],[252,2],[54,0,0],[32,6],[65,19],[32,8],[65,1],[32,2],[32,3],[16, builtin('__Porffor_set_write')],[33,10],[26],[32,7],[252,3],[32,8],[252,3],[65,9],[108],[106],[34,19],[32,4],[34,18],[57,0,4],[32,19],[32,5],[58,0,12],[32,0],[65,20],[15]],
     params: [124,127,124,127,124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
-    locals: [124,124,124,124,127,124,127], localNames: ["_this","_this#type","key","key#type","value","value#type","keys","vals","size","keyIdx","#last_type","#member_setter_val_tmp","#member_setter_ptr_tmp"],
+    locals: [124,124,124,124,127,124,124,127,127,127,127,127,124,127], localNames: ["_this","_this#type","key","key#type","value","value#type","keys","vals","size","i","#last_type","__tmpop_left","__tmpop_right","compare_left_pointer","compare_left_length","compare_right_pointer","compare_index","compare_index_end","#member_setter_val_tmp","#member_setter_ptr_tmp"],
   };
   this.__Map_prototype_delete = {
-    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[34,4],[65,19],[32,2],[32,3],[16, builtin('__Porffor_set_indexOf')],[33,7],[33,5],[32,7],[33,6],[32,5],[68,0,0,0,0,0,0,240,191],[97],[4,64],[68,0,0,0,0,0,0,0,0],[65,2],[15],[11],[32,4],[65,19],[32,2],[32,3],[16, builtin('__Set_prototype_delete')],[33,7],[26],[32,0],[252,2],[40,0,4],[183],[34,8],[65,208,0],[32,5],[32,6],[68,0,0,0,0,0,0,240,63],[65,1],[65,4],[65,0],[54,1,0],[68,0,0,0,0,0,0,16,64],[65,208,0],[16, builtin('__Array_prototype_splice')],[33,7],[26],[68,0,0,0,0,0,0,240,63],[65,2],[15]],
+    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,4],[32,0],[252,2],[40,0,4],[183],[33,5],[32,4],[252,2],[40,0,0],[183],[33,6],[68,0,0,0,0,0,0,0,0],[33,7],[3,64],[32,7],[32,6],[99],[4,64],[2,64],[2,127,"string_only"],[32,4],[65,19],[32,7],[65,1],[16, builtin('__Porffor_set_read')],[33,8],[34,9,"string_only"],[32,2],[34,10,"string_only"],[32,8,"string_only|start"],[65,195,1],[70],[32,3],[65,195,1],[70],[113],[4,64],[32,9],[252,3],[34,11],[32,10],[252,3],[34,13],[71],[4,127],[32,11],[40,0,0],[34,12],[32,13],[40,0,0],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,14],[32,12],[33,15],[3,64],[32,14],[32,11],[106],[45,0,4],[32,14],[32,13],[106],[45,0,4],[71],[4,64],[65,0],[12,2],[11],[32,14],[65,1],[106],[34,14],[32,15],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11],[32,8],[65,195,0],[70],[32,8],[65,195,1],[70],[114],[32,3],[65,195,0],[70],[32,3],[65,195,1],[70],[114],[114],[4,64],[32,9],[252,3],[34,11],[32,10],[252,3],[34,13],[71],[4,127],[32,11],[40,0,0],[34,12],[32,13],[40,0,0],[32,8],[65,195,1],[70],[4,64],[32,11],[32,12],[16, builtin('__Porffor_bytestringToString')],[33,11],[11],[32,3],[65,195,1],[70],[4,64],[32,13],[32,13],[40,0,0],[16, builtin('__Porffor_bytestringToString')],[33,13],[11],[71],[4,64],[65,0],[12,1],[11],[65,0],[33,14],[32,12],[65,2],[108],[33,15],[3,64],[32,14],[32,11],[106],[47,0,4],[32,14],[32,13],[106],[47,0,4],[71],[4,64],[65,0],[12,2],[11],[32,14],[65,2],[106],[34,14],[32,15],[72],[13,0],[11],[65,1],[5],[65,1],[11],[12,1],[11,"string_only|end"],[97],[11,"string_only"],[32,8],[65,128,1],[114],[32,3],[65,128,1],[114],[70],[113],[4,64],[32,4],[65,19],[32,2],[32,3],[16, builtin('__Set_prototype_delete')],[33,8],[26],[32,5],[65,208,0],[32,7],[65,1],[68,0,0,0,0,0,0,240,63],[65,1],[65,4],[65,0],[54,1,0],[68,0,0,0,0,0,0,16,64],[65,208,0],[16, builtin('__Array_prototype_splice')],[33,8],[26],[68,0,0,0,0,0,0,240,63],[65,2],[15],[11],[11],[32,7],[68,0,0,0,0,0,0,240,63],[160],[33,7],[12,1],[11],[11],[68,0,0,0,0,0,0,0,0],[65,2],[15]],
     params: [124,127,124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
-    locals: [124,124,127,127,124], localNames: ["_this","_this#type","key","key#type","keys","keyIdx","keyIdx#type","#last_type","vals"],
+    locals: [124,124,124,124,127,124,124,127,127,127,127,127], localNames: ["_this","_this#type","key","key#type","keys","vals","size","i","#last_type","__tmpop_left","__tmpop_right","compare_left_pointer","compare_left_length","compare_right_pointer","compare_index","compare_index_end"],
   };
   this.__Map_prototype_clear = {
     wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[34,2],[65,19],[16, builtin('__Set_prototype_clear')],[26],[26],[32,0],[252,2],[40,0,4],[183],[34,4],[252,3],[68,0,0,0,0,0,0,0,0],[34,5],[252,3],[54,1,0],[68,0,0,0,0,0,0,0,0],[65,128,1],[15]],

package/compiler/wrap.js

@@ -10,16 +10,26 @@ const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs'))
 
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
+const checkOOB = (memory, ptr) => ptr >= memory.buffer.byteLength;
+
+let dv;
+const read = (ta, memory, ptr, length) => {
+  if (ta === Uint8Array) return new Uint8Array(memory.buffer, ptr, length);
+  return new ta(memory.buffer.slice(ptr, ptr + length * ta.BYTES_PER_ELEMENT), 0, length);
+};
+
 export const readByteStr = (memory, ptr) => {
-  const length = (new Uint32Array(memory.buffer, ptr, 1))[0];
-  return Array.from(new Uint8Array(memory.buffer, ptr + 4, length)).map(x => String.fromCharCode(x)).join('');
+  const length = read(Uint32Array, memory, ptr, 1)[0];
+  return Array.from(read(Uint8Array, memory, ptr + 4, length)).map(x => String.fromCharCode(x)).join('');
 };
 
 export const writeByteStr = (memory, ptr, str) => {
   const length = str.length;
-  (new Uint32Array(memory.buffer, ptr, 1))[0] = length;
 
-  const arr = new Uint8Array(memory.buffer, ptr + 4, length);
+  if (dv.memory !== memory) dv = new DataView(memory.buffer);
+  dv.setUint32(ptr, length, true);
+
+  const arr = read(Uint8Array, memory, ptr + 4, length);
   for (let i = 0; i < length; i++) {
     arr[i] = str.charCodeAt(i);
   }
@@ -32,7 +42,31 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return undefined;
 
     case TYPES.boolean: return Boolean(value);
-    case TYPES.object: return value === 0 ? null : {};
+    case TYPES.object: {
+      if (value === 0 || checkOOB(memory, value)) return null;
+
+      const [ keysPtr, valsPtr ] = read(Uint32Array, memory, value, 2);
+      if (checkOOB(memory, keysPtr) || checkOOB(memory, valsPtr)) return null;
+
+      const size = read(Uint32Array, memory, keysPtr, 1);
+
+      const out = {};
+      for (let i = 0; i < size; i++) {
+        const offset = 4 + (i * 9);
+
+        const kValue = read(Float64Array, memory, keysPtr + offset, 1)[0];
+        const kType = read(Uint8Array, memory, keysPtr + offset + 8, 1)[0];
+        const k = porfToJSValue({ memory, funcs, pages }, kValue, kType);
+
+        const vValue = read(Float64Array, memory, valsPtr + offset, 1)[0];
+        const vType = read(Uint8Array, memory, valsPtr + offset + 8, 1)[0];
+        const v = porfToJSValue({ memory, funcs, pages }, vValue, vType);
+
+        out[k] = v;
+      }
+
+      return out;
+    }
 
     case TYPES.function: {
       let func;
@@ -49,29 +83,24 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.string: {
-      const length = (new Uint32Array(memory.buffer, value, 1))[0];
-      return Array.from(new Uint16Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+      const length = read(Uint32Array, memory, value, 1)[0];
+      return Array.from(read(Uint16Array, memory, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.bytestring: {
-      const length = (new Uint32Array(memory.buffer, value, 1))[0];
-      return Array.from(new Uint8Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
+      const length = read(Uint32Array, memory, value, 1)[0];
+      return Array.from(read(Uint8Array, memory, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.array: {
-      const length = (new Uint32Array(memory.buffer, value, 1))[0];
+      const length = read(Uint32Array, memory, value, 1)[0];
 
       const out = [];
       for (let i = 0; i < length; i++) {
         const offset = value + 4 + (i * 9);
 
-        // have to slice because of memory alignment (?)
-        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
-        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
-
-        // console.log(`reading value at index ${i}...`)
-        // console.log('  memory:', Array.from(new Uint8Array(memory.buffer, offset, 9)).map(x => x.toString(16).padStart(2, '0')).join(' '));
-        // console.log('  read:', { value: v, type: t }, '\n');
+        const v = read(Float64Array, memory, offset, 1)[0];
+        const t = read(Uint8Array, memory, offset + 8, 1)[0];
 
         out.push(porfToJSValue({ memory, funcs, pages }, v, t));
       }
@@ -80,7 +109,7 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.date: {
-      const t = (new Float64Array(memory.buffer, value, 1))[0];
+      const t = read(Float64Array, memory, value, 1)[0];
       return new Date(t);
     }
 
@@ -90,15 +119,15 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
 
       const offset = descStore + 4 + ((value - 1) * 9);
 
-      const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
-      const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+      const v = read(Float64Array, memory, offset, 1)[0];
+      const t = read(Uint8Array, memory, offset + 8, 1)[0];
 
       const desc = porfToJSValue({ memory, funcs, pages }, v, t);
       return Symbol(desc);
     }
 
     case TYPES.arraybuffer: {
-      const length = (new Uint32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const length = read(Uint32Array, memory, value, 1)[0];
       if (length === 4294967295) {
         // mock detached
         const buf = new ArrayBuffer(0);
@@ -110,16 +139,16 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.sharedarraybuffer: {
-      const length = (new Uint32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
+      const length = read(Uint32Array, memory, value, 1)[0];
       const buf = memory.buffer.slice(value + 4, value + 4 + length);
       buf.shared = true;
       return buf;
     }
 
     case TYPES.dataview: {
-      const [ length, ptr, byteOffset ] = (new Uint32Array(memory.buffer.slice(value, value + 12), 0, 3));
+      const [ length, ptr, byteOffset ] = read(Uint32Array, memory, value, 3);
       const bufferPtr = ptr - byteOffset;
-      const bufferLen = (new Uint32Array(memory.buffer.slice(bufferPtr, bufferPtr + 4), 0, 1))[0];
+      const bufferLen = read(Uint32Array, memory, bufferPtr, 1)[0];
       const buffer = memory.buffer.slice(bufferPtr + 4, bufferPtr + 4 + bufferLen);
       return new DataView(buffer, byteOffset, length);
     }
@@ -133,26 +162,26 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     case TYPES.int32array:
     case TYPES.float32array:
     case TYPES.float64array: {
-      const [ length, ptr ] = (new Uint32Array(memory.buffer.slice(value, value + 8), 0, 2));
-      return new globalThis[TYPE_NAMES[type]](memory.buffer, ptr + 4, length);
+      const [ length, ptr ] = read(Uint32Array, memory, value, 2);
+      return read(globalThis[TYPE_NAMES[type]], memory, ptr + 4, length);
     }
 
     case TYPES.weakref: {
-      const v = (new Float64Array(memory.buffer.slice(value, value + 8), 0, 1))[0];
-      const t = (new Uint8Array(memory.buffer, value + 8, 1))[0];
+      const v = read(Float64Array, memory, value, 1)[0];
+      const t = read(Uint8Array, memory, value + 8, 1)[0];
 
       return new WeakRef(porfToJSValue({ memory, funcs, pages }, v, t));
     }
 
     case TYPES.weakset:
     case TYPES.set: {
-      const size = (new Uint32Array(memory.buffer, value, 1))[0];
+      const size = read(Uint32Array, memory, value, 1)[0];
 
       const out = type === TYPES.weakset ? new WeakSet() : new Set();
       for (let i = 0; i < size; i++) {
         const offset = value + 4 + (i * 9);
-        const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
-        const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
+        const v = read(Float64Array, memory, offset, 1)[0];
+        const t = read(Uint8Array, memory, offset + 8, 1)[0];
 
         out.add(porfToJSValue({ memory, funcs, pages }, v, t));
       }
@@ -162,19 +191,19 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
 
     case TYPES.weakmap:
     case TYPES.map: {
-      const [ keysPtr, valsPtr ] = (new Uint32Array(memory.buffer, value, 2));
-      const size = (new Uint32Array(memory.buffer, keysPtr, 1))[0];
+      const [ keysPtr, valsPtr ] = read(Uint32Array, memory, value, 2);
+      const size = read(Uint32Array, memory, keysPtr, 1)[0];
 
       const out = type === TYPES.weakmap ? new WeakMap() : new Map();
       for (let i = 0; i < size; i++) {
         const offset = 4 + (i * 9);
 
-        const kValue = (new Float64Array(memory.buffer.slice(keysPtr + offset, keysPtr + offset + 8), 0, 1))[0];
-        const kType = (new Uint8Array(memory.buffer, keysPtr + offset + 8, 1))[0];
+        const kValue = read(Float64Array, memory, keysPtr + offset, 1)[0];
+        const kType = read(Uint8Array, memory, keysPtr + offset + 8, 1)[0];
         const k = porfToJSValue({ memory, funcs, pages }, kValue, kType);
 
-        const vValue = (new Float64Array(memory.buffer.slice(valsPtr + offset, valsPtr + offset + 8), 0, 1))[0];
-        const vType = (new Uint8Array(memory.buffer, valsPtr + offset + 8, 1))[0];
+        const vValue = read(Float64Array, memory, valsPtr + offset, 1)[0];
+        const vType = read(Uint8Array, memory, valsPtr + offset + 8, 1)[0];
         const v = porfToJSValue({ memory, funcs, pages }, vValue, vType);
 
         out.set(k, v);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.19.5+2501992d8",
+  "version": "0.19.7+120636c7c",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.19.5+2501992d8';
+globalThis.version = '0.19.7+120636c7c';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {

package/runner/repl.js

@@ -82,7 +82,10 @@ let prev = '';
 const run = (source, _context, _filename, callback, run = true) => {
   // hack: print "secret" before latest code ran to only enable printing for new code
 
-  let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source.trim();
+  source = source.trim();
+  if (source.startsWith('{') && source.endsWith('}')) source = '(' + source + ')';
+
+  let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source;
 
   let shouldPrint = !prev;
   const { exports, pages } = compile(toRun, [], {}, str => {