porffor 0.60.10 → 0.60.12

package/compiler/codegen.js

@@ -73,17 +73,6 @@ export const allocStr = (scope, str, bytestring) => {
   return allocBytes(scope, str, bytes);
 };
 
-const todo = (scope, msg, expectsValue = undefined) => {
-  msg = `todo: ${msg}`;
-
-  switch (Prefs.todoTime ?? 'runtime') {
-    case 'compile':
-      throw new Error(msg);
-
-    case 'runtime':
-      return internalThrow(scope, 'Error', msg, expectsValue);
-  }
-};
 
 const isFuncType = type =>
   type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression' ||
@@ -107,7 +96,7 @@ const funcRef = func => {
 
   func.generate?.();
 
-  const wrapperArgc = Prefs.indirectWrapperArgc ?? 10;
+  const wrapperArgc = Prefs.indirectWrapperArgc ?? 16;
   if (!func.wrapperFunc) {
     const locals = {
       ['#length']: { idx: 0, type: Valtype.i32 }
@@ -202,11 +191,11 @@ const funcRef = func => {
         wasm.push(
           [ Opcodes.local_get, array ],
           [ Opcodes.local_get, 5 + i * 2 ],
-          [ Opcodes.f64_store, 0, offset ],
+          [ Opcodes.f64_store, 0, ...unsignedLEB128(offset) ],
 
           [ Opcodes.local_get, array ],
           [ Opcodes.local_get, 6 + i * 2 ],
-          [ Opcodes.i32_store8, 0, offset + 8 ],
+          [ Opcodes.i32_store8, 0, ...unsignedLEB128(offset + 8) ],
         );
         offset += 9;
       }
@@ -443,7 +432,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateTaggedTemplate(scope, decl, global, name, valueUnused));
 
     case 'ExportNamedDeclaration':
-      if (!decl.declaration) return todo(scope, 'unsupported export declaration', true);
+      if (!decl.declaration) return internalThrow(scope, 'Error', 'porffor: unsupported export declaration', true);
 
       const funcsBefore = funcs.map(x => x.name);
       generate(scope, decl.declaration);
@@ -469,6 +458,12 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       if (Prefs.d) log.warning('codegen', 'with is not supported, treating as expression');
       return cacheAst(decl, generate(scope, decl.body));
 
+    case 'PrivateIdentifier':
+      return cacheAst(decl, generate(scope, {
+        type: 'Literal',
+        value: privateIDName(decl.name)
+      }));
+
     case 'TSEnumDeclaration':
       return cacheAst(decl, generateEnum(scope, decl));
 
@@ -479,7 +474,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
         return cacheAst(decl, [ number(UNDEFINED) ]);
       }
 
-      return cacheAst(decl, todo(scope, `no generation for ${decl.type}!`, true));
+      return cacheAst(decl, internalThrow(scope, 'Error', `porffor: no generation for ${decl.type}`, true));
   }
 };
 
@@ -905,8 +900,6 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     '??': nullish
   };
 
-  if (!checks[op]) return todo(scope, `logic operator ${op} not implemented yet`, true);
-
   // generic structure for {a} OP {b}
   // _ = {a}; if (OP_CHECK) {b} else _
 
@@ -1286,7 +1279,6 @@ const performOp = (scope, op, left, right, leftType, rightType) => {
 
   // some complex ops are implemented in funcs
   if (typeof ops === 'function') return finalize(asmFuncToAsm(scope, ops, { left, right }));
-  if (!ops) return todo(scope, `operator ${op} not implemented yet`, true);
   if (!Array.isArray(ops)) ops = [ ops ];
   ops = [ ops ];
 
@@ -1950,6 +1942,13 @@ const getNodeType = (scope, node) => {
       return getNodeType(scope, node.body);
     }
 
+    if (node.type === 'PrivateIdentifier') {
+      return getNodeType(scope, {
+        type: 'Literal',
+        value: privateIDName(node.name)
+      });
+    }
+
     if (node.type.endsWith('Statement') || node.type.endsWith('Declaration')) {
       return TYPES.undefined;
     }
@@ -2021,8 +2020,6 @@ const generateLiteral = (scope, decl, global, name) => {
       ]
     });
   }
-
-  return todo(scope, `cannot generate literal of type ${typeof decl.value}`, true);
 };
 
 const generateExp = (scope, decl) => {
@@ -2561,7 +2558,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     funcs.table = true;
     scope.table = true;
 
-    const wrapperArgc = Prefs.indirectWrapperArgc ?? 10;
+    const wrapperArgc = Prefs.indirectWrapperArgc ?? 16;
     const underflow = wrapperArgc - args.length;
     for (let i = 0; i < underflow; i++) args.push(DEFAULT_VALUE());
     if (args.length > wrapperArgc) args = args.slice(0, wrapperArgc);
@@ -2629,14 +2626,14 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
       ...typeSwitch(scope, getNodeType(scope, callee), {
         [TYPES.function]: () => [
-          number(10 - underflow, Valtype.i32),
+          number(wrapperArgc - underflow, Valtype.i32),
           ...forceDuoValtype(scope, newTargetWasm, Valtype.f64),
           ...forceDuoValtype(scope, thisWasm, Valtype.f64),
           ...out,
 
           [ Opcodes.local_get, calleeLocal ],
           Opcodes.i32_to_u,
-          [ Opcodes.call_indirect, args.length + 2, 0,  ],
+          [ Opcodes.call_indirect, args.length + 2, 0 ],
           ...setLastType(scope)
         ],
 
@@ -3525,8 +3522,6 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
             ]
           }, undefined, global)
         );
-      } else {
-        return todo(scope, `${prop.type} is not supported in object patterns`);
       }
     }
 
@@ -3567,8 +3562,6 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     }),
     [ Opcodes.drop ]
   ];
-
-  return todo(scope, `variable declarators of type ${pattern.type} are not supported yet`);
 }
 
 const generateVar = (scope, decl) => {
@@ -3637,7 +3630,7 @@ const memberTmpNames = scope => {
 };
 
 // todo: generate this array procedurally
-const builtinPrototypeGets = ['size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength', 'name', 'message', 'constructor', 'source', 'flags', 'global', 'ignoreCase', 'multiline', 'dotAll', 'unicode', 'sticky', 'hasIndices', 'unicodeSets'];
+const builtinPrototypeGets = ['size', 'description', 'byteLength', 'byteOffset', 'buffer', 'detached', 'resizable', 'growable', 'maxByteLength', 'name', 'message', 'constructor', 'source', 'flags', 'global', 'ignoreCase', 'multiline', 'dotAll', 'unicode', 'sticky', 'hasIndices', 'unicodeSets', 'lastIndex'];
 
 const ctHash = prop => {
   if (!Prefs.ctHash || !prop ||
@@ -4437,8 +4430,6 @@ const generateUnary = (scope, decl) => {
       return out;
     }
   }
-
-  return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
 };
 
 const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
@@ -5564,7 +5555,8 @@ const generateMeta = (scope, decl) => {
     return [ number(UNDEFINED) ];
   }
 
-  return todo(scope, `meta property object ${decl.meta.name} is not supported yet`, true);
+  // todo: import.meta
+  return internalThrow(scope, 'Error', `porffor: meta property ${decl.meta.name}.${decl.property.name} is not supported yet`, true);
 };
 
 const compileBytes = (val, itemType) => {

package/compiler/precompile.js

@@ -57,7 +57,7 @@ const compile = async (file, _funcs) => {
     first = source.slice(0, source.indexOf('\n'));
   }
 
-  let args = ['--module', '--todo-time=compile', '--truthy=no_nan_negative', '--no-rm-unused-types', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data', '--no-treeshake-wasm-imports', '--no-coctc'];
+  let args = ['--module', '--truthy=no_nan_negative', '--no-rm-unused-types', '--fast-length', '--parse-types', '--opt-types', '--no-passive-data', '--active-data', '--no-treeshake-wasm-imports', '--no-coctc'];
   if (first.startsWith('// @porf')) {
     args = first.slice('// @porf '.length).split(' ').concat(args);
   }
@@ -88,6 +88,7 @@ const compile = async (file, _funcs) => {
     const body = globalThis.funcBodies[x.name];
     const bodyHasTopLevelThrow = body?.body && body.body.some(x => x.type === 'ThrowStatement');
 
+    if (x.name === '_eval') x.name = 'eval';
     if (x.data) {
       x.data = x.data.reduce((acc, x) => { acc[data[x].page] = data[x].bytes; return acc; }, {});
     }
@@ -278,7 +279,7 @@ ${funcs.map(x => {
   const name = x.name.includes('#') ? `['${x.name}']` : `.${x.name}`;
 
   const returnTypes = [...(x.returnTypes ?? [])].filter(x => ![ TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ].includes(x));
-  return `x${name} = {
+  return `x${name}={
 wasm:${rewriteWasm(x.wasm)},
 params:${JSON.stringify(x.params)},typedParams:1,returns:${JSON.stringify(x.returns)},${x.returnType != null ? `returnType:${JSON.stringify(x.returnType)},` : ''}${returnTypes.length > 0 ? `returnTypes:${JSON.stringify(returnTypes)},` : ''}jsLength:${x.jsLength},
 locals:${JSON.stringify(locals.slice(x.params.length).map(x => x[1].type))},localNames:${JSON.stringify(locals.map(x => x[0]))},

package/deno.lock

@@ -0,0 +1,18 @@
+{
+  "version": "5",
+  "redirects": {
+    "https://esm.sh/acorn": "https://esm.sh/acorn@8.14.0"
+  },
+  "remote": {
+    "https://esm.sh/acorn@8.14.0": "b5a42b450cfd514709a3f855bfb1d886104d9c72a01b7d111e6e26c86e5f41e2",
+    "https://esm.sh/acorn@8.14.0/denonext/acorn.mjs": "669c981ded732a02351d5e6b1f6d5641d71a8d5165c0fed93be7f40c676be0b8"
+  },
+  "workspace": {
+    "packageJson": {
+      "dependencies": [
+        "npm:acorn@^8.15.0",
+        "npm:node-repl-polyfill@~0.1.2"
+      ]
+    }
+  }
+}

package/foo.js

@@ -1,34 +1,40 @@
-// benchmark.js
-const ITER = 50_000_000; // 50 million iterations
-const key = "a";
+// Function.prototype;
+// // Object.defineProperty(Function.prototype, "prop", {
+// //   value: 1001,
+// //   writable: false,
+// //   enumerable: false,
+// //   configurable: true
+// // });
+// var funObj = function() {};
+// // console.log(Function.prototype.hasOwnProperty);
+// // console.log(Function.prototype.hasOwnProperty === Object.prototype.hasOwnProperty);
+// // console.log(Object.getPrototypeOf(funObj) === Function.prototype);
+// // console.log(Object.getPrototypeOf(Object.getPrototypeOf(funObj)) === Object.prototype);
+// console.log(funObj.hasOwnProperty);
 
-// Create a null-prototype object
-const o = Object.create(null);
-o[key] = 123;
+// // console.log(funObj.hasOwnProperty("prop"), false, 'funObj.hasOwnProperty("prop")');
 
-// --- Benchmark "in" ---
-const t1 = Date.now();
-for (let i = 0; i < ITER; i++) {
-  if (key in o) {
-    // noop
-  }
-}
-console.log(`in: ${Date.now() - t1}ms`);
+var FACTORY = function() {
+  this.aproperty = 1;
+};
 
-// --- Benchmark Object.hasOwn ---
-const t2 = Date.now();
-for (let i = 0; i < ITER; i++) {
-  if (Object.hasOwn(o, key)) {
-    // noop
-  }
-}
-console.log(`Object.hasOwn: ${Date.now() - t2}ms`);
+var instance = new FACTORY;
 
-// --- Benchmark o[k] ---
-const t3 = Date.now();
-for (let i = 0; i < ITER; i++) {
-  if (o[key] !== undefined) {
-    // noop
-  }
-}
-console.log(`o[k]: ${Date.now() - t3}ms`);
+console.log(instance.__proto__ == FACTORY.prototype);
+console.log(instance.__proto__.__proto__ == Object.prototype);
+console.log(instance.hasOwnProperty);
+console.log(instance.__proto__.hasOwnProperty);
+console.log(instance.__proto__.__proto__.hasOwnProperty);
+console.log()
+
+console.log(
+  typeof Object.prototype.hasOwnProperty,
+  "function",
+  'The value of `typeof Object.prototype.hasOwnProperty` is expected to be "function"'
+);
+
+console.log(
+  typeof instance.hasOwnProperty,
+  "function",
+  'The value of `typeof instance.hasOwnProperty` is expected to be "function"'
+);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.60.10",
+  "version": "0.60.12",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

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