porffor 0.30.13 → 0.31.0

package/compiler/2c.js

@@ -231,20 +231,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     prependMain.set('argv', `_argc = argc; _argv = argv;`);
   }
 
-  prepend.set('func decls', funcs.filter(x => x.name !== 'main').map(f => {
-    const returns = f.returns.length > 0;
-    const typedReturns = f.returnType == null;
-
-    const invLocals = inv(f.locals, x => x.idx);
-    for (const x in invLocals) {
-      invLocals[x] = sanitize(invLocals[x]);
-    }
-
-    const shouldInline = false;
-
-    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
-  }).join('\n'));
-
   if (out) out += '\n';
 
   const line = (str, semi = true) => out += `${str}${semi ? ';' : ''}\n`;
@@ -438,7 +424,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
         case Opcodes.f64_const: {
           const val = i[1];
-          vals.push(val);
+          vals.push(val.toString());
           break;
         }
 
@@ -822,7 +808,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
-          // log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
+          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
       }
 
       lastCond = false;
@@ -844,6 +830,20 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
   cify(funcs.find(x => x.name === 'main'));
 
+  prepend.set('func decls', funcs.filter(x => x.name !== 'main' && cified.has(x.name)).map(f => {
+    const returns = f.returns.length > 0;
+    const typedReturns = f.returnType == null;
+
+    const invLocals = inv(f.locals, x => x.idx);
+    for (const x in invLocals) {
+      invLocals[x] = sanitize(invLocals[x]);
+    }
+
+    const shouldInline = false;
+
+    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
+  }).join('\n'));
+
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;
 

package/compiler/allocators.js

@@ -39,6 +39,7 @@ export class StaticAllocator {
     if (globalThis.precompile && scopeName === 'main') scopeName = globalThis.precompile;
     const reason = `${this.allocType(itemType)}: ${Prefs.scopedPageNames ? (scopeName + '/') : ''}${name}`;
 
+    this.lastName = reason;
     if (pages.has(reason)) {
       const ptr = this.lastPtr = this.ptr(pages.get(reason).ind);
       return number(ptr, Valtype.i32);

package/compiler/assemble.js

@@ -203,7 +203,7 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
     }
 
     data.push({
-      offset,
+      page: 'func lut',
       bytes
     });
     data.addedFuncArgcLut = true;
@@ -358,11 +358,18 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   const dataSection = data.length === 0 ? [] : createSection(
     Section.data,
     encodeVector(data.map(x => {
-      // type: active
-      if (x.offset != null) return [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ];
+      const bytes = encodeVector(x.bytes);
+
+      if (x.page != null) {
+        // type: active
+        const offset = pages.get(x.page).ind * pageSize;
+        bytes.unshift(0x00, Opcodes.i32_const, ...signedLEB128(offset), Opcodes.end);
+      } else {
+        // type: passive
+        bytes.unshift(0x01);
+      }
 
-      // type: passive
-      return [ 0x01, ...encodeVector(x.bytes) ];
+      return bytes;
     }))
   );
 

package/compiler/builtins/_internal_object.ts

@@ -174,9 +174,8 @@ export const __Porffor_object_get = (obj: any, key: any): any => {
   if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot get property of null');
 
   if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.function) {
-    let tmp: bytestring = '';
-    tmp = 'name';
-    if (key == tmp) {
+    const tmp1: bytestring = 'name';
+    if (key == tmp1) {
       const o: bytestring = __Porffor_funcLut_name(obj);
       const t: i32 = Porffor.TYPES.bytestring;
       Porffor.wasm`
@@ -186,8 +185,8 @@ local.get ${t}
 return`;
     }
 
-    tmp = 'length';
-    if (key == tmp) {
+    const tmp2: bytestring = 'length';
+    if (key == tmp2) {
       const o: i32 = __Porffor_funcLut_length(obj);
       Porffor.wasm`
 local.get ${o}
@@ -198,12 +197,37 @@ return`;
   }
 
   if (Porffor.wasm`local.get ${obj+1}` != Porffor.TYPES.object) obj = __Porffor_object_getObject(obj);
-  const entryPtr: i32 = __Porffor_object_lookup(obj, key);
+  let entryPtr: i32 = __Porffor_object_lookup(obj, key);
   if (entryPtr == -1) {
-    Porffor.wasm`
+    const protoKey: bytestring = '__proto__';
+
+    if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.object) {
+      // check prototype chain
+      let lastProto = obj;
+      if (key != protoKey) {
+        while (true) {
+          obj = __Porffor_object_get(obj, protoKey);
+          if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
+          lastProto = obj;
+
+          if ((entryPtr = __Porffor_object_lookup(obj, key)) != -1) break;
+        }
+      } else {
+        const i: i32 = __Object_prototype;
+        Porffor.wasm`
+local.get ${i}
+f64.convert_i32_u
+i32.const 7 ;; object type
+return`;
+      }
+    }
+
+    if (entryPtr == -1) {
+      Porffor.wasm`
 f64.const 0
 i32.const 128
 return`;
+    }
   }
 
   const tail: i32 = Porffor.wasm.i32.load16_u(entryPtr, 0, 12);
@@ -424,15 +448,14 @@ export const __Porffor_object_delete = (obj: any, key: any): boolean => {
   if (Porffor.wasm`local.get ${obj}` == 0) throw new TypeError('Cannot delete property of null');
 
   if (Porffor.wasm`local.get ${obj+1}` == Porffor.TYPES.function) {
-    let tmp: bytestring = '';
-    tmp = 'name';
-    if (key == tmp) {
+    const tmp1: bytestring = 'name';
+    if (key == tmp1) {
       __Porffor_funcLut_deleteName(obj);
       return true;
     }
 
-    tmp = 'length';
-    if (key == tmp) {
+    const tmp2: bytestring = 'length';
+    if (key == tmp2) {
       __Porffor_funcLut_deleteLength(obj);
       return true;
     }

package/compiler/builtins/arraybuffer.ts

@@ -1,7 +1,11 @@
 import type {} from './porffor.d.ts';
 
 export const __ArrayBuffer_isView = (value: any): boolean => {
-  if (value.buffer) return true;
+  const t: i32 = Porffor.rawType(value);
+  if (Porffor.fastOr(
+    t == Porffor.TYPES.dataview,
+    Porffor.fastAnd(t >= Porffor.TYPES.uint8array, t <= Porffor.TYPES.float64array)
+  )) return true;
   return false;
 };
 

package/compiler/builtins/object.ts

@@ -171,13 +171,11 @@ export const __Object_prototype_hasOwnProperty = (_this: any, prop: any) => {
   }
 
   if (t == Porffor.TYPES.function) {
-    let tmp: bytestring = '';
+    const tmp1: bytestring = 'name';
+    if (p == tmp1) return !__Porffor_funcLut_isNameDeleted(_this);
 
-    tmp = 'name';
-    if (p == tmp) return !__Porffor_funcLut_isNameDeleted(_this);
-
-    tmp = 'length';
-    if (p == tmp) return !__Porffor_funcLut_isLengthDeleted(_this);
+    const tmp2: bytestring = 'length';
+    if (p == tmp2) return !__Porffor_funcLut_isLengthDeleted(_this);
 
     return false;
   }
@@ -190,6 +188,26 @@ export const __Object_hasOwn = (obj: any, prop: any) => {
   return __Object_prototype_hasOwnProperty(obj, prop);
 };
 
+export const __Porffor_object_in = (obj: any, prop: any) => {
+  if (__Object_prototype_hasOwnProperty(obj, prop)) {
+    return true;
+  }
+
+  const t: i32 = Porffor.rawType(obj);
+  if (t != Porffor.TYPES.object) {
+    return false;
+  }
+
+  let lastProto = obj;
+  while (true) {
+    obj = obj.__proto__;
+    if (Porffor.fastOr(obj == null, Porffor.wasm`local.get ${obj}` == Porffor.wasm`local.get ${lastProto}`)) break;
+    lastProto = obj;
+
+    if (__Object_prototype_hasOwnProperty(obj, prop)) return true;
+  }
+};
+
 
 export const __Object_assign = (target: any, ...sources: any[]) => {
   if (target == null) throw new TypeError('Argument is nullish, expected object');
@@ -601,11 +619,6 @@ export const __Object_groupBy = (items: any, callbackFn: any) => {
 export const __Object_getPrototypeOf = (obj: any) => {
   if (obj == null) throw new TypeError('Object is nullish, expected object');
 
-  // todo: support non-pure-objects
-  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
-    return {};
-  }
-
   return obj.__proto__;
 };
 

package/compiler/builtins_objects.js

@@ -3,10 +3,12 @@ import { TYPES } from './types.js';
 import { number } from './embedding.js';
 
 export default function({ builtinFuncs }, Prefs) {
+  const makePrefix = name => (name.startsWith('__') ? '' : '__') + name + '_';
+
   const done = new Set();
   const object = (name, props) => {
     done.add(name);
-    const prefix = name === 'globalThis' ? '' : `__${name}_`;
+    const prefix = name === 'globalThis' ? '' : makePrefix(name);
 
     // already a func
     const existingFunc = builtinFuncs[name];
@@ -58,7 +60,7 @@ export default function({ builtinFuncs }, Prefs) {
           if (d.writable) flags |= 0b1000;
 
           // hack: do not generate objects inside of objects as it causes issues atm
-          if (this[prefix + x]?.type === TYPES.object) value = { type: 'ObjectExpression', properties: [] };
+          if (this[prefix + x]?.type === TYPES.object && this[prefix + x] !== this.null) value = { type: 'ObjectExpression', properties: [] };
 
           out.push(
             [ Opcodes.global_get, 0 ],
@@ -124,6 +126,11 @@ export default function({ builtinFuncs }, Prefs) {
           continue;
         }
 
+        if (d.value === null) {
+          this[k] = this.null;
+          continue;
+        }
+
         throw new Error(`unsupported value type (${typeof d.value})`);
       }
     }
@@ -151,7 +158,10 @@ export default function({ builtinFuncs }, Prefs) {
   };
 
   const builtinFuncKeys = Object.keys(builtinFuncs);
-  const autoFuncKeys = name => builtinFuncKeys.filter(x => x.startsWith('__' + name + '_')).map(x => x.slice(name.length + 3));
+  const autoFuncKeys = name => {
+    const prefix = makePrefix(name);
+    return builtinFuncKeys.filter(x => x.startsWith(prefix)).map(x => x.slice(prefix.length));
+  };
   const autoFuncs = name => props({
     writable: true,
     enumerable: false,
@@ -191,7 +201,12 @@ export default function({ builtinFuncs }, Prefs) {
     acc.add(x.slice(0, ind + 10));
     return acc;
   }, new Set())) {
-    object(x, autoFuncs(x));
+    const props = autoFuncs(x);
+
+    // special case: Object.prototype.__proto__ = null
+    if (x === '__Object_prototype') Object.defineProperty(props, '__proto__', { value: { value: null }, enumerable: true });
+
+    object(x, props);
   }
 
 
@@ -291,7 +306,7 @@ export default function({ builtinFuncs }, Prefs) {
     }
     if (!t) continue;
 
-    if (!done.has(name) && !done.has('__' + name)) {
+    if (!done.has(name)) {
       console.log(name.replaceAll('_', '.'), !!builtinFuncs[name]);
       done.add(name);
     }