porffor 0.21.5 → 0.21.6

package/compiler/builtins/_internal_object.ts

@@ -28,6 +28,41 @@ export const __Porffor_object_isInextensible = (ptr: object): boolean => {
 };
 
 
+export const __Porffor_object_overrideAllFlags = (_this: object, overrideOr: i32, overrideAnd: i32) => {
+  let ptr: i32 = Porffor.wasm`local.get ${_this}` + 5;
+
+  const size: i32 = Porffor.wasm.i32.load(_this, 0, 0);
+  const endPtr: i32 = ptr + size * 14;
+
+  for (; ptr < endPtr; ptr += 14) {
+    let flags: i32 = Porffor.wasm.i32.load8_u(ptr, 0, 12);
+    flags = (flags | overrideOr) & overrideAnd;
+    Porffor.wasm.i32.store8(ptr, flags, 0, 12);
+  }
+};
+
+export const __Porffor_object_checkAllFlags = (_this: object, dataAnd: i32, accessorAnd: i32, dataExpected: i32, accessorExpected: i32): boolean => {
+  let ptr: i32 = Porffor.wasm`local.get ${_this}` + 5;
+
+  const size: i32 = Porffor.wasm.i32.load(_this, 0, 0);
+  const endPtr: i32 = ptr + size * 14;
+
+  for (; ptr < endPtr; ptr += 14) {
+    const flags: i32 = Porffor.wasm.i32.load8_u(ptr, 0, 12);
+    if (flags & 0b0001) {
+      // accessor
+      if ((flags & accessorAnd) != accessorExpected) return false;
+    } else {
+      // data
+      if ((flags & dataAnd) != dataExpected) return false;
+    }
+
+  }
+
+  return true;
+};
+
+
 export const __Porffor_object_lookup = (_this: object, target: any): i32 => {
   const targetType: i32 = Porffor.wasm`local.get ${target+1}`;
 

package/compiler/builtins/object.ts

@@ -301,7 +301,7 @@ export const __Object_preventExtensions = (obj: any): any => {
     return obj;
   }
 
-  __Porffor_object_preventExtensions(obj);
+  Porffor.object.preventExtensions(obj);
 
   return obj;
 };
@@ -316,9 +316,45 @@ export const __Object_isExtensible = (obj: any): any => {
     return true;
   }
 
-  return !__Porffor_object_isInextensible(obj);
+  return !Porffor.object.isInextensible(obj);
 };
 
+
+export const __Object_freeze = (obj: any): any => {
+  // todo: support non-pure-objects
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
+    return obj;
+  }
+
+  // make inextensible
+  Porffor.object.preventExtensions(obj);
+
+  // make all properties non-configurable and non-writable (if data descriptor)
+  Porffor.object.overrideAllFlags(obj, 0b0000, 0b0101);
+
+  return obj;
+};
+
+export const __Object_isFrozen = (obj: any): any => {
+  if (!Porffor.object.isObject(obj)) {
+    return true;
+  }
+
+  // todo: support non-pure-objects
+  if (Porffor.rawType(obj) != Porffor.TYPES.object) {
+    return false;
+  }
+
+  // check obj is inextensible
+  if (!Porffor.object.isInextensible(obj)) {
+    return false;
+  }
+
+  // check all properties are non-configurable and non-writable (if data descriptor)
+  return Porffor.object.checkAllFlags(obj, 0b1010, 0b0010, 0, 0);
+};
+
+
 export const __Object_prototype_toString = (_this: object) => {
   let out: bytestring = '[object Object]';
   return out;

package/compiler/codegen.js

@@ -310,7 +310,7 @@ const generateIdent = (scope, decl) => {
       if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
 
       let wasm = builtinVars[name];
-      if (typeof wasm === 'function') wasm = asmFuncToAsm({ name }, wasm);
+      if (typeof wasm === 'function') wasm = asmFuncToAsm(scope, wasm);
       return wasm.slice();
     }
 
@@ -4326,7 +4326,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     const firstAssign = !scope.arrays.has(uniqueName);
     if (firstAssign) scope.arrays.set(uniqueName, rawPtr);
 
-    const local = global ? globals[name] : scope.locals[name];
+    const local = global ? globals[name] : scope.locals?.[name];
     if (
       Prefs.data && firstAssign && useRawElements &&
       name !== '#member_prop' &&

package/compiler/generated_builtins.js

@@ -14,6 +14,18 @@ export const BuiltinFuncs = function() {
     returns: [127,127], typedReturns: 1,
     locals: [127], localNames: ["ptr","ptr#type","out"],
   };
+  this.__Porffor_object_overrideAllFlags = {
+    wasm: (scope, {}) => [[32,0],[65,5],[106],[33,6],[32,0],[40,0,0],[33,7],[32,6],[32,7],[65,14],[108],[106],[33,8],[3,64],[32,6],[32,8],[72],[4,64],[32,6],[45,0,12],[34,9],[32,2],[114],[32,4],[113],[33,9],[32,6],[32,9],[58,0,12],[32,6],[65,14],[106],[34,6],[12,1],[11],[11],[65,0],[65,128,1],[15]],
+    params: [127,127,127,127,127,127], typedParams: 1,
+    returns: [127,127], typedReturns: 1,
+    locals: [127,127,127,127], localNames: ["_this","_this#type","overrideOr","overrideOr#type","overrideAnd","overrideAnd#type","ptr","size","endPtr","flags"],
+  };
+  this.__Porffor_object_checkAllFlags = {
+    wasm: (scope, {}) => [[32,0],[65,5],[106],[33,10],[32,0],[40,0,0],[33,11],[32,10],[32,11],[65,14],[108],[106],[33,12],[3,64],[32,10],[32,12],[72],[4,64],[32,10],[45,0,12],[34,13],[65,1],[113],[4,64],[32,13],[32,4],[113],[32,8],[71],[4,64],[65,0],[65,2],[15],[11],[5],[32,13],[32,2],[113],[32,6],[71],[4,64],[65,0],[65,2],[15],[11],[11],[32,10],[65,14],[106],[34,10],[12,1],[11],[11],[65,1],[65,2],[15]],
+    params: [127,127,127,127,127,127,127,127,127,127], typedParams: 1,
+    returns: [127,127], typedReturns: 1,
+    locals: [127,127,127,127], localNames: ["_this","_this#type","dataAnd","dataAnd#type","accessorAnd","accessorAnd#type","dataExpected","dataExpected#type","accessorExpected","accessorExpected#type","ptr","size","endPtr","flags"],
+  };
   this.__Porffor_object_lookup = {
     wasm: (scope, {}) => [[32,3],[33,4],[32,0],[65,5],[106],[33,5],[32,0],[40,0,0],[33,6],[32,5],[32,6],[65,14],[108],[106],[33,7],[32,4],[65,195,1],[70],[4,64],[32,2],[33,8],[3,64],[32,5],[32,7],[72],[4,64],[2,64],[32,5],[40,0,0],[34,9],[69],[4,64],[12,2],[11],[32,9],[65,31],[118],[4,64],[12,1],[11],[32,9],[34,10],[32,8],[33,13],[34,11],[32,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],[4,64],[32,5],[65,1],[15],[11],[11],[32,5],[65,14],[106],[34,5],[12,1],[11],[11],[5],[32,2],[33,8],[3,64],[32,5],[32,7],[72],[4,64],[2,64],[32,5],[40,0,0],[34,9],[69],[4,64],[12,2],[11],[32,9],[65,31],[118],[4,64],[32,9],[65,255,255,255,255,7],[113],[34,10],[32,8],[33,13],[34,11],[32,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],[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],[4,64],[32,5],[65,1],[15],[11],[11],[11],[32,5],[65,14],[106],[34,5],[12,1],[11],[11],[11],[65,127],[65,1],[15]],
     params: [127,127,127,127], typedParams: 1,
@@ -1743,6 +1755,18 @@ export const BuiltinFuncs = function() {
     returns: [124,127], typedReturns: 1,
     locals: [127,124,127], localNames: ["obj","obj#type","#last_type","#logicinner_tmp","#typeswitch_tmp"],
   };
+  this.__Object_freeze = {
+    wasm: (scope, {builtin}) => [[32,0],[32,1],[16, ...builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,28,64],[98],[4,64],[32,0],[32,1],[15],[11],[32,0],[252,2],[32,1],[16, ...builtin('__Porffor_object_preventExtensions')],[26],[183],[26],[32,0],[252,2],[32,1],[65,0],[65,1],[65,5],[65,1],[16, ...builtin('__Porffor_object_overrideAllFlags')],[26],[183],[26],[32,0],[32,1],[15]],
+    params: [124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [127], localNames: ["obj","obj#type","#last_type"],
+  };
+  this.__Object_isFrozen = {
+    wasm: (scope, {builtin}) => [[32,0],[252,2],[32,1],[16, ...builtin('__Porffor_object_isObject')],[33,2],[183],[33,3],[32,2],[33,4],[2,124],[32,4],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,3],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,4],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,3],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,3],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],[68,0,0,0,0,0,0,240,63],[65,2],[15],[11],[32,0],[32,1],[16, ...builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,28,64],[98],[4,64],[68,0,0,0,0,0,0,0,0],[65,2],[15],[11],[32,0],[252,2],[32,1],[16, ...builtin('__Porffor_object_isInextensible')],[33,2],[183],[33,3],[32,2],[33,4],[2,124],[32,4],[65,195,0],[70],[4,64,"TYPESWITCH|String"],[32,3],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,4],[65,195,1],[70],[4,64,"TYPESWITCH|ByteString"],[32,3],[252,3],[40,1,0],[69],[184],[12,1],[11],[32,3],[68,0,0,0,0,0,0,0,0],[97],[184],[11,"TYPESWITCH_end"],[252,3],[4,64],[68,0,0,0,0,0,0,0,0],[65,2],[15],[11],[32,0],[252,2],[32,1],[65,10],[65,1],[65,2],[65,1],[65,0],[65,1],[65,0],[65,1],[16, ...builtin('__Porffor_object_checkAllFlags')],[33,2],[183],[32,2],[15]],
+    params: [124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [127,124,127], localNames: ["obj","obj#type","#last_type","#logicinner_tmp","#typeswitch_tmp"],
+  };
   this.__Object_prototype_toString = {
     wasm: (scope, {allocPage}) => [...number(allocPage(scope, 'bytestring: __Object_prototype_toString/out', 'i8') * pageSize, 124),[34,2],[65,195,1],[15]],
     params: [124,127], typedParams: 1,

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.21.5+21083a990",
+  "version": "0.21.6+e77e4f0cb",
   "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.21.5+21083a990';
+globalThis.version = '0.21.6+e77e4f0cb';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -62,6 +62,12 @@ if (process.argv.includes('--help')) {
   process.exit(0);
 }
 
+const done = async () => {
+  // do nothing for the rest of this file
+  await new Promise(res => process.on('beforeExit', res));
+  process.exit();
+};
+
 let file = process.argv.slice(2).find(x => x[0] !== '-');
 if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
   // remove this arg
@@ -69,17 +75,17 @@ if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm
 
   if (file === 'precompile') {
     await import('../compiler/precompile.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
+    await done();
   }
 
   if (file === 'profile') {
     await import('./profile.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
+    await done();
   }
 
   if (file === 'debug') {
     await import('./debug.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
+    await done();
   }
 
   if (['wasm', 'native', 'c'].includes(file)) {
@@ -109,7 +115,7 @@ if (!file) {
 
   // run repl if no file given
   await import('./repl.js');
-  await new Promise(() => {}); // do nothing for the rest of this file
+  await done();
 }
 
 const source = fs.readFileSync(file, 'utf8');