porffor 0.22.6 → 0.22.8

package/compiler/assemble.js

@@ -107,6 +107,8 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
         }
 
         if (inst[0] === Opcodes.call_indirect) {
+          if (!funcs.table) funcs.table = true;
+
           const params = [];
           for (let i = 0; i < inst[1]; i++) {
             params.push(valtypeBinary, Valtype.i32);
@@ -230,7 +232,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   //   };
   // }
 
-  const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, x.index ]);
+  const exports = funcs.filter(x => x.export).map((x, i) => [ ...encodeString(x.name === 'main' ? 'm' : x.name), ExportDesc.func, ...unsignedLEB128(x.index) ]);
 
   if (Prefs.alwaysMemory && pages.size === 0) pages.set('--always-memory', 0);
   if (optLevel === 0) pages.set('O0 precaution', 0);
@@ -276,7 +278,26 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
       if (typeCount !== 0) localDecl.push(encodeLocal(typeCount, lastType));
 
-      return encodeVector([ ...encodeVector(localDecl), ...x.wasm.flat().filter(x => x != null && x <= 0xff), Opcodes.end ]);
+      // todo: move const, call transforms here too?
+
+      const wasm = [];
+      for (let i = 0; i < x.wasm.length; i++) {
+        let o = x.wasm[i];
+
+        if (
+          (o[0] === Opcodes.local_get || o[0] === Opcodes.local_set || o[0] === Opcodes.local_tee || o[0] === Opcodes.global_get || o[0] === Opcodes.global_set) &&
+          o[1] > 127
+        ) {
+          const n = o[1];
+          o = [...o];
+          o.pop();
+          unsignedLEB128_into(n, o);
+        }
+
+        wasm.push(...o);
+      }
+
+      return encodeVector([ ...encodeVector(localDecl), ...wasm.flat().filter(x => x != null && x <= 0xff), Opcodes.end ]);
     }))
   );
 

package/compiler/builtins/_internal_object.ts

@@ -63,6 +63,33 @@ export const __Porffor_object_checkAllFlags = (_this: object, dataAnd: i32, acce
 };
 
 
+export const __Porffor_object_packAccessor = (get: i32, set: i32): f64 => {
+  // pack i32s get & set into a single f64 (i64)
+  Porffor.wasm`
+local.get ${set}
+i64.extend_i32_u
+i64.const 32
+i64.shl
+local.get ${get}
+i64.extend_i32_u
+i64.or
+
+f64.reinterpret_i64
+i32.const 1
+return`;
+};
+
+export const __Porffor_object_accessorGet = (entryPtr: i32): Function => {
+  const out: Function = Porffor.wasm.i32.load(entryPtr, 0, 4);
+  return out;
+};
+
+export const __Porffor_object_accessorSet = (entryPtr: i32): Function => {
+  const out: Function = Porffor.wasm.i32.load(entryPtr, 0, 8);
+  return out;
+};
+
+
 export const __Porffor_object_lookup = (_this: object, target: any): i32 => {
   const targetType: i32 = Porffor.wasm`local.get ${target+1}`;
 
@@ -120,11 +147,10 @@ return`;
 
   if (tail & 0b0001) {
     // accessor descriptor
-    // todo
-
+    const get: Function = __Porffor_object_accessorGet(entryPtr);
     Porffor.wasm`
-f64.const 0
-i32.const 128
+local.get ${get}
+call_indirect 0 0
 return`;
   }
 
@@ -178,7 +204,12 @@ export const __Porffor_object_set = (_this: object, key: any, value: any): any =
 
     if (tail & 0b0001) {
       // accessor descriptor
-      // todo
+      const set: Function = __Porffor_object_accessorSet(entryPtr);
+    Porffor.wasm`
+local.get ${value}
+local.get ${value+1}
+local.get ${set}
+call_indirect 1 0`;
 
       return value;
     }
@@ -325,7 +356,6 @@ export const __Porffor_object_isObject = (arg: any): boolean => {
   return Porffor.fastAnd(
     arg != 0, // null
     t > 0x05,
-    t != Porffor.TYPES.undefined,
     t != Porffor.TYPES.string,
     t != Porffor.TYPES.bytestring,
   );
@@ -336,7 +366,6 @@ export const __Porffor_object_isObjectOrSymbol = (arg: any): boolean => {
   return Porffor.fastAnd(
     arg != 0, // null
     t > 0x04,
-    t != Porffor.TYPES.undefined,
     t != Porffor.TYPES.string,
     t != Porffor.TYPES.bytestring,
   );

package/compiler/builtins/object.ts

@@ -227,6 +227,7 @@ export const __Object_defineProperty = (target: any, prop: any, descriptor: any)
     }
 
     accessor = true;
+    value = Porffor.object.packAccessor(get, set);
   }
 
   let flags: i32 = 0b0000;
@@ -412,7 +413,8 @@ export const __Object_getOwnPropertyDescriptor = (obj: any, prop: any): any => {
   out.enumerable = Boolean(tail & 0b0100);
 
   if (tail & 0b0001) {
-    // accessor descriptor
+    out.get = Porffor.object.accessorGet(entryPtr);
+    out.set = Porffor.object.accessorSet(entryPtr);
 
     return out;
   }

package/compiler/builtins/reflect.ts

@@ -1,34 +1,132 @@
 import type {} from './porffor.d.ts';
 
 // todo: support receiver
-export const __Reflect_get = (target: any, property: any) => {
+export const __Reflect_get = (target: any, prop: any) => {
   if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
 
-  const p: any = ecma262.ToPropertyKey(property);
+  return target[prop];
+};
 
-  const t: i32 = Porffor.rawType(target);
-  if (t == Porffor.TYPES.object) {
-    return Porffor.object.get(target, p);
+// todo: support receiver
+export const __Reflect_set = (target: any, prop: any, value: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  try {
+    target[prop] = value;
+    return true;
+  } catch {
+    return false;
   }
+};
 
-  const keys: any[] = Object.keys(target);
-  const idx: i32 = __Array_prototype_indexOf(keys, p);
-  if (idx == -1) return undefined;
+export const __Reflect_has = (target: any, prop: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
 
-  const vals: any[] = Object.values(target);
-  return vals[idx];
+  return prop in target;
 };
 
-export const __Reflect_has = (target: any, property: any) => {
+export const __Reflect_defineProperty = (target: any, prop: any, descriptor: any) => {
   if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+  if (!Porffor.object.isObject(descriptor)) throw new TypeError('Descriptor is a non-object');
 
-  const p: any = ecma262.ToPropertyKey(property);
+  try {
+    Object.defineProperty(target, prop, descriptor);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+export const __Reflect_deleteProperty = (target: any, prop: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  return delete target[prop];
+};
+
+export const __Reflect_getOwnPropertyDescriptor = (target: any, prop: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  return Object.getOwnPropertyDescriptor(target, prop);
+};
+
+export const __Reflect_isExtensible = (target: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  return Object.isExtensible(target);
+};
+
+export const __Reflect_preventExtensions = (target: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  try {
+    Object.preventExtensions(target);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+export const __Reflect_ownKeys = (target: any) => {
+  if (!Porffor.object.isObject(target)) throw new TypeError('Target is a non-object');
+
+  const out: any[] = Porffor.allocate();
 
   const t: i32 = Porffor.rawType(target);
   if (t == Porffor.TYPES.object) {
-    return Porffor.object.lookup(target, p) != -1;
+    let ptr: i32 = Porffor.wasm`local.get ${target}` + 5;
+    const endPtr: i32 = ptr + Porffor.wasm.i32.load(target, 0, 0) * 14;
+
+    let i: i32 = 0;
+    for (; ptr < endPtr; ptr += 14) {
+      let key: any;
+      Porffor.wasm`local raw i32
+local msb i32
+local.get ${ptr}
+i32.to_u
+i32.load 0 0
+local.set raw
+
+local.get raw
+i32.const 30
+i32.shr_u
+local.tee msb
+if 127
+  i32.const 5 ;; symbol
+  i32.const 67 ;; string
+  local.get msb
+  i32.const 3
+  i32.eq
+  select
+  local.set ${key+1}
+
+  local.get raw
+  i32.const 1073741823
+  i32.and ;; unset 2 MSBs
+else
+  i32.const 195
+  local.set ${key+1}
+
+  local.get raw
+end
+i32.from_u
+local.set ${key}`;
+
+      out[i++] = key;
+    }
+
+    out.length = i;
+  } else if (Porffor.fastOr(
+    t == Porffor.TYPES.array,
+    t == Porffor.TYPES.bytestring,
+    t == Porffor.TYPES.string
+  )) {
+    const len: i32 = target.length;
+    out.length = len;
+
+    for (let i: i32 = 0; i < len; i++) {
+      out[i] = __Number_prototype_toString(i);
+    }
   }
 
-  const keys: any[] = Object.keys(target);
-  return __Array_prototype_includes(keys, p);
+  return out;
 };

package/compiler/codegen.js

@@ -39,7 +39,7 @@ const todo = (scope, msg, expectsValue = undefined) => {
 const isFuncType = type =>
   type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
 const hasFuncWithName = name =>
-  Object.hasOwn(funcIndex, name) != null || Object.hasOwn(builtinFuncs, name) != null || Object.hasOwn(importedFuncs, name) != null || Object.hasOwn(internalConstrs, name) != null;
+  Object.hasOwn(funcIndex, name) || Object.hasOwn(builtinFuncs, name) || Object.hasOwn(importedFuncs, name) || Object.hasOwn(internalConstrs, name);
 
 const astCache = new WeakMap();
 const cacheAst = (decl, wasm) => {
@@ -164,6 +164,8 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateMember(scope, decl, global, name));
 
     case 'ExportNamedDeclaration':
+      if (!decl.declaration) return todo(scope, 'unsupported export declaration');
+
       const funcsBefore = funcs.map(x => x.name);
       generate(scope, decl.declaration);
 
@@ -2835,9 +2837,6 @@ const generateVar = (scope, decl) => {
         scope.globalInits[name] = newOut;
       }
     }
-
-    // hack: this follows spec properly but is mostly unneeded 😅
-    // out.push(...setType(scope, name, x.init ? getNodeType(scope, x.init) : TYPES.undefined));
   }
 
   return out;