porffor 0.41.4 → 0.41.6

package/compiler/codegen.js

@@ -893,7 +893,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
 
 const asmFuncToAsm = (scope, func) => {
   return func(scope, {
-    TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage, internalThrow,
+    Valtype, Opcodes, TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage, internalThrow,
     getNodeType, generate, generateIdent,
     builtin: (n, offset = false) => {
       let idx = funcIndex[n] ?? importedFuncs[n];
@@ -910,6 +910,7 @@ const asmFuncToAsm = (scope, func) => {
 
       return idx;
     },
+    hasFunc: x => funcIndex[x] != null,
     funcRef: name => {
       if (funcIndex[name] == null && builtinFuncs[name]) {
         includeBuiltin(scope, name);
@@ -3854,8 +3855,12 @@ const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
 };
 
 const generateIf = (scope, decl) => {
-  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test), false, true);
+  if (globalThis.precompile && decl.test?.tag?.name === '__Porffor_comptime_flag') {
+    const flag = decl.test.quasi.quasis[0].value.raw;
+    return [ [ null, 'comptime_flag', flag, decl.consequent, '#', Prefs ] ];
+  }
 
+  const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test), false, true);
 
   out.push([ Opcodes.if, Blocktype.void ]);
   depth.push('if');
@@ -5414,17 +5419,40 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
 
     const known = knownType(scope, getNodeType(scope, decl.object));
     for (const x of prototypes) {
-      const type = TYPES[x.split('_prototype')[0].slice(2).toLowerCase()];
+      let type = TYPES[x.split('_prototype')[0].slice(2).toLowerCase()];
       if (type == null) continue;
 
       // do not __proto__ primitive hack for objects or functions
       if (type === TYPES.object || type === TYPES.function) continue;
 
+      // hack: do not support primitives for Object.prototype.isPrototypeOf
+      if (scope.name === '__Object_prototype_isPrototypeOf') {
+        switch (type) {
+          case TYPES.boolean:
+            type = TYPES.booleanobject;
+            break;
+
+          case TYPES.number:
+            type = TYPES.numberobject;
+            break;
+
+          case TYPES.string:
+            type = TYPES.stringobject;
+            break;
+
+          case TYPES.bytestring:
+            continue;
+        }
+      }
+
       const ident = {
         type: 'Identifier',
         name: x
       };
 
+      // hack: bytestrings should return string prototype
+      if (type === TYPES.bytestring) ident.name = '__String_prototype';
+
       bc[type] = () => [
         ...generate(scope, ident),
         ...setLastType(scope, getNodeType(scope, ident))
@@ -5926,6 +5954,10 @@ let objectHackers = [];
 const objectHack = node => {
   if (!node) return node;
 
+  // delete .end, .loc while here
+  delete node.end;
+  delete node.loc;
+
   if (node.type === 'MemberExpression') {
     const out = (() => {
       const abortOut = { ...node, object: objectHack(node.object) };
@@ -5950,7 +5982,7 @@ const objectHack = node => {
       if (objectName !== 'Object_prototype' && (node.property.name === 'propertyIsEnumerable' || node.property.name === 'hasOwnProperty' || node.property.name === 'isPrototypeOf')) return abortOut;
 
       const name = '__' + objectName + '_' + node.property.name;
-      if ((!hasFuncWithName(name) && !Object.hasOwn(builtinVars, name)) && (hasFuncWithName(objectName) || Object.hasOwn(builtinVars, objectName))) return abortOut;
+      if ((!hasFuncWithName(name) && !Object.hasOwn(builtinVars, name) && !isExistingProtoFunc(name) && !hasFuncWithName(name + '$get')) && (hasFuncWithName(objectName) || Object.hasOwn(builtinVars, objectName) || hasFuncWithName('__' + objectName) || Object.hasOwn(builtinVars, '__' + objectName))) return abortOut;
 
       if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 

package/compiler/precompile.js

@@ -52,6 +52,8 @@ const compile = async (file, _funcs) => {
 
   const returnOverrides = {
     __Porffor_object_get: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_getExplicit: [ Valtype.f64, Valtype.i32 ],
+    __Porffor_object_readValue: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_set: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_setStrict: [ Valtype.f64, Valtype.i32 ],
     __Porffor_object_packAccessor: [ Valtype.f64, Valtype.i32 ]
@@ -201,6 +203,10 @@ const precompile = async () => {
   const total = performance.now() - t;
   console.log(`\r${' '.repeat(100)}\r\u001b[90m${`[${total.toFixed(2)}ms]`.padEnd(12, ' ')}\u001b[0m\u001b[92mcompiled ${fileCount} files (${funcs.length} funcs)\u001b[0m \u001b[90m(${['parse', 'codegen', 'opt'].map(x => `${x}: ${((timing[x] / total) * 100).toFixed(0)}%`).join(', ')})\u001b[0m`);
 
+  const comptimeFlagChecks = {
+    hasFunc: x => `hasFunc('${x}')`
+  };
+
   return `// autogenerated by compiler/precompile.js
 import { number } from './embedding.js';
 
@@ -219,9 +225,19 @@ ${funcs.map(x => {
       .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(_,'${constructor}',\`${message}\`)`)
       .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(_,{name:'${objName}'})`)
       .replace(/\[null,"typeswitch case start",\[(.*?)\]\],/g, (_, types) => `...t([${types}],()=>[`)
-      .replaceAll(',[null,"typeswitch case end"]', '])');
-
-    return `(_,{${str.includes('...t(') ? 't,' : ''}${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('funcRef(') ? 'funcRef,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}${str.includes('generateIdent(') ? 'generateIdent,' : ''}`.slice(0, -1)}})=>`.replace('_,{}', '') + str;
+      .replaceAll(',[null,"typeswitch case end"]', '])')
+      .replace(/\[null,"comptime_flag","(.*?)",(\{.*?\}),"#",(\{.*?\})\]/g, (_, flag, ast, prefs) => {
+        ast = JSON.parse(ast.replaceAll('\n', '\\n'));
+        ast = JSON.stringify(ast, (k, v) => {
+          if (k === 'loc' || k === 'start' || k === 'end') return undefined;
+          return v;
+        });
+
+        const [ id, extra ] = flag.split('.');
+        return `[null,()=>{if(${comptimeFlagChecks[id](extra)}){const r=()=>{valtype=Prefs.valtype??'f64';valtypeBinary=Valtype[valtype];const valtypeInd=['i32','i64','f64'].indexOf(valtype);Opcodes.i32_to=[[],[Opcodes.i32_wrap_i64],Opcodes.i32_trunc_sat_f64_s][valtypeInd];Opcodes.i32_to_u=[[],[Opcodes.i32_wrap_i64],Opcodes.i32_trunc_sat_f64_u][valtypeInd];Opcodes.i32_from=[[],[Opcodes.i64_extend_i32_s],[Opcodes.f64_convert_i32_s]][valtypeInd];Opcodes.i32_from_u=[[],[Opcodes.i64_extend_i32_u],[ Opcodes.f64_convert_i32_u]][valtypeInd]};const a=Prefs;Prefs=${prefs};r();const b=generate(_,${ast});Prefs=a;r();return b;}return []}]`;
+      });
+
+    return `(_,{${str.includes('hasFunc(') ? 'hasFunc,' : ''}${str.includes('Valtype[') ? 'Valtype,' : ''}${str.includes('Opcodes.') ? 'Opcodes,' : ''}${str.includes('...t(') ? 't,' : ''}${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('funcRef(') ? 'funcRef,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}${str.includes('generateIdent(') ? 'generateIdent,' : ''}${str.includes('generate(') ? 'generate,' : ''}`.slice(0, -1)}})=>`.replace('_,{}', '') + str;
   };
 
   const locals = Object.entries(x.locals).sort((a,b) => a[1].idx - b[1].idx)
@@ -238,9 +254,9 @@ locals:${JSON.stringify(locals.slice(x.params.length).map(x => x[1].type))},loca
 ${usedTypes.length > 0 ? `usedTypes:${JSON.stringify(usedTypes)},` : ''}
 ${x.globalInits ? `globalInits:{${Object.keys(x.globalInits).map(y => `${y}:${rewriteWasm(x.globalInits[y])}`).join(',')}},` : ''}${x.data && Object.keys(x.data).length > 0 ? `data:${JSON.stringify(x.data)},` : ''}
 ${x.table ? `table:1,` : ''}${x.constr ? `constr:1,` : ''}${x.hasRestArgument ? `hasRestArgument:1,` : ''}
-};`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
+}`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
 }).join('\n')}
-};`;
+}`;
 };
 
 fs.writeFileSync(join(__dirname, 'builtins_precompiled.js'), await precompile());

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.41.4+e41715a96",
+  "version": "0.41.6+eb38ba00c",
   "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.41.4+e41715a96';
+globalThis.version = '0.41.6+eb38ba00c';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {