porffor 0.56.1 → 0.56.3

package/compiler/codegen.js

@@ -433,8 +433,6 @@ const lookup = (scope, name, failEarly = false) => {
   let local = scope.locals[name];
 
   if (Object.hasOwn(builtinVars, name)) {
-    if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
-
     let wasm = builtinVars[name];
     if (wasm.usesImports) scope.usesImports = true;
 
@@ -508,9 +506,8 @@ const lookup = (scope, name, failEarly = false) => {
 const lookupOrError = (scope, name, failEarly) => lookup(scope, name, failEarly)
   ?? internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
 
-const generateIdent = (scope, decl) => {
-  return lookupOrError(scope, decl.name, scope.identFailEarly);
-};
+const generateIdent = (scope, decl) =>
+  lookupOrError(scope, decl.name, scope.identFailEarly);
 
 const generateYield = (scope, decl) => {
   let arg = decl.argument ?? DEFAULT_VALUE();
@@ -763,21 +760,19 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
   ];
 };
 
-const concatStrings = (scope, left, right, leftType, rightType) => {
-  return [
-    ...left,
-    ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
-    ...leftType,
+const concatStrings = (scope, left, right, leftType, rightType) => [
+  ...left,
+  ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
+  ...leftType,
 
-    ...right,
-    ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
-    ...rightType,
+  ...right,
+  ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
+  ...rightType,
 
-    [ Opcodes.call, includeBuiltin(scope, '__Porffor_concatStrings').index ],
-    ...setLastType(scope),
-    ...(valtypeBinary === Valtype.i32 ? [ Opcodes.i32_trunc_sat_f64_u ] : []),
-  ];
-};
+  [ Opcodes.call, includeBuiltin(scope, '__Porffor_concatStrings').index ],
+  ...setLastType(scope),
+  ...(valtypeBinary === Valtype.i32 ? [ Opcodes.i32_trunc_sat_f64_u ] : []),
+];
 
 const compareStrings = (scope, left, right, leftType, rightType, noConv = false) => {
   if (noConv) return [
@@ -1241,89 +1236,87 @@ const generateBinaryExp = (scope, decl) => {
   return out;
 };
 
-const asmFuncToAsm = (scope, func, extra) => {
-  return func(scope, {
-    Valtype, Opcodes, TYPES, TYPE_NAMES, usedTypes, typeSwitch, makeString, internalThrow,
-    getNodeType, generate, generateIdent,
-    builtin: (n, offset = false) => {
-      let idx = funcIndex[n] ?? importedFuncs[n];
-      if (idx == null && builtinFuncs[n]) {
-        includeBuiltin(scope, n);
-        idx = funcIndex[n];
-      }
+const asmFuncToAsm = (scope, func, extra) => func(scope, {
+  Valtype, Opcodes, TYPES, TYPE_NAMES, usedTypes, typeSwitch, makeString, internalThrow,
+  getNodeType, generate, generateIdent,
+  builtin: (n, offset = false) => {
+    let idx = funcIndex[n] ?? importedFuncs[n];
+    if (idx == null && builtinFuncs[n]) {
+      includeBuiltin(scope, n);
+      idx = funcIndex[n];
+    }
 
-      scope.includes ??= new Set();
-      scope.includes.add(n);
+    scope.includes ??= new Set();
+    scope.includes.add(n);
 
-      if (idx == null) throw new Error(`builtin('${n}') failed: could not find func (from ${scope.name})`);
-      if (offset) idx -= importedFuncs.length;
+    if (idx == null) throw new Error(`builtin('${n}') failed: could not find func (from ${scope.name})`);
+    if (offset) idx -= importedFuncs.length;
 
-      return idx;
-    },
-    hasFunc: x => funcIndex[x] != null,
-    funcRef: name => {
-      if (funcIndex[name] == null && builtinFuncs[name]) {
-        includeBuiltin(scope, name);
-      }
+    return idx;
+  },
+  hasFunc: x => funcIndex[x] != null,
+  funcRef: name => {
+    if (funcIndex[name] == null && builtinFuncs[name]) {
+      includeBuiltin(scope, name);
+    }
 
-      const func = funcByName(name);
-      return funcRef(func);
-    },
-    glbl: (opcode, name, type) => {
-      const globalName = '#porf#' + name; // avoid potential name clashing with user js
-      if (!globals[globalName]) {
-        const idx = globals['#ind']++;
-        globals[globalName] = { idx, type };
-
-        const tmpIdx = globals['#ind']++;
-        globals[globalName + '#glbl_inited'] = { idx: tmpIdx, type: Valtype.i32 };
-      }
+    const func = funcByName(name);
+    return funcRef(func);
+  },
+  glbl: (opcode, name, type) => {
+    const globalName = '#porf#' + name; // avoid potential name clashing with user js
+    if (!globals[globalName]) {
+      const idx = globals['#ind']++;
+      globals[globalName] = { idx, type };
+
+      const tmpIdx = globals['#ind']++;
+      globals[globalName + '#glbl_inited'] = { idx: tmpIdx, type: Valtype.i32 };
+    }
 
-      const out = [
-        [ opcode, globals[globalName].idx ]
-      ];
+    const out = [
+      [ opcode, globals[globalName].idx ]
+    ];
 
-      scope.initedGlobals ??= new Set();
-      if (!scope.initedGlobals.has(name)) {
-        scope.initedGlobals.add(name);
-        if (scope.globalInits[name]) out.unshift(
-          [ Opcodes.global_get, globals[globalName + '#glbl_inited'].idx ],
-          [ Opcodes.i32_eqz ],
-          [ Opcodes.if, Blocktype.void ],
-          ...asmFuncToAsm(scope, scope.globalInits[name]),
-          number(1, Valtype.i32),
-          [ Opcodes.global_set, globals[globalName + '#glbl_inited'].idx ],
-          [ Opcodes.end ]
-        );
-      }
+    scope.initedGlobals ??= new Set();
+    if (!scope.initedGlobals.has(name)) {
+      scope.initedGlobals.add(name);
+      if (scope.globalInits[name]) out.unshift(
+        [ Opcodes.global_get, globals[globalName + '#glbl_inited'].idx ],
+        [ Opcodes.i32_eqz ],
+        [ Opcodes.if, Blocktype.void ],
+        ...asmFuncToAsm(scope, scope.globalInits[name]),
+        number(1, Valtype.i32),
+        [ Opcodes.global_set, globals[globalName + '#glbl_inited'].idx ],
+        [ Opcodes.end ]
+      );
+    }
 
-      return out;
-    },
-    loc: (name, type) => {
-      if (!scope.locals[name]) {
-        const idx = scope.localInd++;
-        scope.locals[name] = { idx, type };
-      }
+    return out;
+  },
+  loc: (name, type) => {
+    if (!scope.locals[name]) {
+      const idx = scope.localInd++;
+      scope.locals[name] = { idx, type };
+    }
 
-      return scope.locals[name].idx;
-    },
-    t: (types, wasm) => {
-      if (types.some(x => usedTypes.has(x))) {
-        return wasm();
-      } else {
-        return [ [ null, () => {
-          if (types.some(x => usedTypes.has(x))) return wasm();
-          return [];
-        } ] ];
-      }
-    },
-    i32ify: wasm => {
-      wasm.push(Opcodes.i32_to_u);
-      return wasm;
-    },
-    allocPage: (scope, name) => allocPage({ scope, pages }, name)
-  }, extra);
-};
+    return scope.locals[name].idx;
+  },
+  t: (types, wasm) => {
+    if (types.some(x => usedTypes.has(x))) {
+      return wasm();
+    } else {
+      return [ [ null, () => {
+        if (types.some(x => usedTypes.has(x))) return wasm();
+        return [];
+      } ] ];
+    }
+  },
+  i32ify: wasm => {
+    wasm.push(Opcodes.i32_to_u);
+    return wasm;
+  },
+  allocPage: (scope, name) => allocPage({ scope, pages }, name)
+}, extra);
 
 const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globals: globalTypes = [], globalInits = [], returns = [], returnType, localNames = [], globalNames = [], table = false, constr = false, hasRestArgument = false, usesTag = false, usesImports = false, usedTypes = [] } = {}) => {
   if (wasm == null) { // called with no built-in
@@ -1395,9 +1388,8 @@ const includeBuiltin = (scope, builtin) => {
   return asmFunc(builtin, builtinFuncs[builtin]);
 };
 
-const generateLogicExp = (scope, decl) => {
-  return performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
-};
+const generateLogicExp = (scope, decl) =>
+  performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
 
 const isExistingProtoFunc = name => {
   if (name.startsWith('__Array_prototype')) return !!prototypeFuncs[TYPES.array][name.slice(18)];
@@ -2452,7 +2444,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     idx = importedFuncs[name];
     scope.usesImports = true;
   } else if (Object.hasOwn(builtinFuncs, name)) {
-    if (builtinFuncs[name].floatOnly && valtype !== 'f64') throw new Error(`Cannot use built-in ${unhackName(name)} with integer valtype`);
     if (decl._new && !builtinFuncs[name].constr) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a constructor`, true);
 
     includeBuiltin(scope, name);
@@ -3204,7 +3195,7 @@ const setDefaultFuncName = (decl, name) => {
 const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
   // statically analyzed ffi dlopen hack to let 2c handle it
   if (init && init.type === 'CallExpression' && init.callee.name === '__Porffor_dlopen') {
-    if (Prefs.target !== 'native' && !Prefs.native) throw new Error('Porffor.dlopen is only supported for native target (use --native)');
+    if (Prefs.target !== 'native' && Prefs.target !== 'c' && !Prefs.native) throw new Error('Porffor.dlopen is only supported for native target (use --native)');
 
     // disable pgo if using ffi (lol)
     Prefs.pgo = false;
@@ -5322,9 +5313,7 @@ const generateTry = (scope, decl) => {
   return out;
 };
 
-const generateEmpty = (scope, decl) => {
-  return [ number(UNDEFINED) ];
-};
+const generateEmpty = (scope, decl) => [ number(UNDEFINED) ];
 
 const generateMeta = (scope, decl) => {
   if (decl.meta.name === 'new' && decl.property.name === 'target') {
@@ -6461,7 +6450,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
     index: currentFuncIndex++,
     arrow,
     constr: !arrow && !decl.generator && !decl.async && !decl._method, // constructable
-    method: decl._method || decl.generator || decl.async, // has this but not constructable
+    method: !arrow && (decl._method || decl.generator || decl.async), // has this but not constructable
     async: decl.async,
     subclass: decl._subclass, _onlyConstr: decl._onlyConstr, _onlyThisMethod: decl._onlyThisMethod,
     strict: scope.strict || decl.strict,
@@ -6540,10 +6529,34 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
               );
             }
 
+            if (typeAnno.type === TYPES.string) {
+              wasm.push(
+                [ Opcodes.local_get, func.locals[name].idx + 1 ],
+                number(TYPES.string, Valtype.i32),
+                [ Opcodes.i32_ne ],
+                [ Opcodes.if, Blocktype.void ],
+                  [ Opcodes.local_get, func.locals[name].idx ],
+                  [ Opcodes.f64_convert_i32_s ],
+                  [ Opcodes.local_get, func.locals[name].idx + 1 ],
+                  [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToString').index ],
+                  [ Opcodes.local_set, func.locals[name].idx + 1 ],
+                  Opcodes.i32_trunc_sat_f64_s,
+                  [ Opcodes.local_set, func.locals[name].idx ],
+                  [ Opcodes.local_get, func.locals[name].idx + 1 ],
+                  number(TYPES.bytestring, Valtype.i32),
+                  [ Opcodes.i32_eq ],
+                  [ Opcodes.if, Blocktype.void ],
+                    [ Opcodes.local_get, func.locals[name].idx ],
+                    [ Opcodes.call, includeBuiltin(scope, '__Porffor_bytestringToString').index ],
+                    [ Opcodes.local_set, func.locals[name].idx ],
+                  [ Opcodes.end ],
+                [ Opcodes.end ]
+              );
+            }
+
             if ([
               TYPES.date, TYPES.number, TYPES.promise, TYPES.symbol, TYPES.function,
-              TYPES.set, TYPES.map,
-              TYPES.weakref, TYPES.weakset, TYPES.weakmap,
+              TYPES.set, TYPES.map, TYPES.weakref, TYPES.weakset, TYPES.weakmap,
               TYPES.arraybuffer, TYPES.sharedarraybuffer, TYPES.dataview
             ].includes(typeAnno.type)) {
               let types = [ typeAnno.type ];
@@ -6558,8 +6571,6 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
               );
             }
           }
-
-          // todo: if string, try converting to it to one
         }
 
         if (def) wasm.push(

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.56.1",
+  "version": "0.56.3",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},
   "dependencies": {
-    "acorn": "^8.14.0",
+    "acorn": "^8.14.1",
     "node-repl-polyfill": "github:CanadaHonk/node-repl-polyfill"
   },
   "optionalDependencies": {

package/r.cjs

@@ -1,298 +1,16 @@
-let obj = {
-  wow() {}
-};
-
-console.log(obj.wow.prototype);
-
-// var EQUAL = 1;
-// var NOT_EQUAL = -1;
-// var UNKNOWN = 0;
-
-// function setCache(cache, left, right, result) {
-//   var otherCache;
-
-//   otherCache = cache.get(left);
-//   if (!otherCache) cache.set(left, otherCache = new Map());
-//   otherCache.set(right, result);
-
-//   otherCache = cache.get(right);
-//   if (!otherCache) cache.set(right, otherCache = new Map());
-//   otherCache.set(left, result);
-// }
-
-// function getCache(cache, left, right) {
-//   var otherCache;
-//   var result;
-
-//   otherCache = cache.get(left);
-//   result = otherCache && otherCache.get(right);
-//   if (result) return result;
-
-//   otherCache = cache.get(right);
-//   result = otherCache && otherCache.get(left);
-//   if (result) return result;
-
-//   return UNKNOWN;
-// }
-
-// function cacheComparison(a, b, compare, cache) {
-//   var result = compare(a, b, cache);
-//   if (cache && (result === EQUAL || result === NOT_EQUAL)) {
-//     setCache(cache, a, b, result);
-//   }
-//   return result;
-// }
-
-// function isBoxed(value) {
-//   return value instanceof String
-//     || value instanceof Number
-//     || value instanceof Boolean
-//     || value instanceof Symbol;
-// }
-
-// function fail() {
-//   return NOT_EQUAL;
-// }
-
-// function compareIf(a, b, test, compare, cache) {
-//   return !test(a)
-//     ? !test(b) ? UNKNOWN : NOT_EQUAL
-//     : !test(b) ? NOT_EQUAL : cacheComparison(a, b, compare, cache);
-// }
-
-// function compareEquality(a, b, cache) {
-//   return compareIf(a, b, isOptional, compareOptionality)
-//     || compareIf(a, b, isPrimitiveEquatable, comparePrimitiveEquality)
-//     || compareIf(a, b, isObjectEquatable, compareObjectEquality, cache)
-//     || NOT_EQUAL;
-// }
-
-// function tryCompareStrictEquality(a, b) {
-//   return a === b ? EQUAL : UNKNOWN;
-// }
-
-// function tryCompareTypeOfEquality(a, b) {
-//   return typeof a !== typeof b ? NOT_EQUAL : UNKNOWN;
-// }
-
-// function tryCompareToStringTagEquality(a, b) {
-//   var aTag = Symbol.toStringTag in a ? a[Symbol.toStringTag] : undefined;
-//   var bTag = Symbol.toStringTag in b ? b[Symbol.toStringTag] : undefined;
-//   return aTag !== bTag ? NOT_EQUAL : UNKNOWN;
-// }
-
-// function isOptional(value) {
-//   return value === undefined
-//     || value === null;
-// }
-
-// function compareOptionality(a, b) {
-//   return tryCompareStrictEquality(a, b)
-//     || NOT_EQUAL;
-// }
-
-// function isPrimitiveEquatable(value) {
-//   switch (typeof value) {
-//     case 'string':
-//     case 'number':
-//     case 'boolean':
-//     case 'symbol':
-//       return true;
-//     default:
-//       return isBoxed(value);
-//   }
-// }
-
-// function comparePrimitiveEquality(a, b) {
-//   if (isBoxed(a)) a = a.valueOf();
-//   if (isBoxed(b)) b = b.valueOf();
-
-//   return tryCompareStrictEquality(a, b)
-//     || tryCompareTypeOfEquality(a, b)
-//     || compareIf(a, b, isNaNEquatable, compareNaNEquality)
-//     || NOT_EQUAL;
-// }
-
-// function isNaNEquatable(value) {
-//   return typeof value === 'number';
-// }
-
-// function compareNaNEquality(a, b) {
-//   return isNaN(a) && isNaN(b) ? EQUAL : NOT_EQUAL;
-// }
-
-// function isObjectEquatable(value) {
-//   return typeof value === 'object';
-// }
-
-// function compareObjectEquality(a, b, cache) {
-//   if (!cache) cache = new Map();
-
-//   return getCache(cache, a, b)
-//     || setCache(cache, a, b, EQUAL) // consider equal for now
-//     || cacheComparison(a, b, tryCompareStrictEquality, cache)
-//     || cacheComparison(a, b, tryCompareToStringTagEquality, cache)
-//     || compareIf(a, b, isValueOfEquatable, compareValueOfEquality)
-//     || compareIf(a, b, isToStringEquatable, compareToStringEquality)
-//     || compareIf(a, b, isArrayLikeEquatable, compareArrayLikeEquality, cache)
-//     || compareIf(a, b, isStructurallyEquatable, compareStructuralEquality, cache)
-//     || compareIf(a, b, isIterableEquatable, compareIterableEquality, cache)
-//     || cacheComparison(a, b, fail, cache);
-// }
-
-// function isValueOfEquatable(value) {
-//   return value instanceof Date;
-// }
-
-// function compareValueOfEquality(a, b) {
-//   return compareIf(a.valueOf(), b.valueOf(), isPrimitiveEquatable, comparePrimitiveEquality)
-//     || NOT_EQUAL;
-// }
-
-// function isToStringEquatable(value) {
-//   return value instanceof RegExp;
-// }
-
-// function compareToStringEquality(a, b) {
-//   return compareIf(a.toString(), b.toString(), isPrimitiveEquatable, comparePrimitiveEquality)
-//     || NOT_EQUAL;
-// }
-
-// function isArrayLikeEquatable(value) {
-//   return Array.isArray(value)
-//     || value instanceof Uint8Array
-//     || value instanceof Uint8ClampedArray
-//     || value instanceof Uint16Array
-//     || value instanceof Uint32Array
-//     || value instanceof Int8Array
-//     || value instanceof Int16Array
-//     || value instanceof Int32Array
-//     || value instanceof Float32Array
-//     || value instanceof Float64Array;
-// }
-
-// function compareArrayLikeEquality(a, b, cache) {
-//   if (a.length !== b.length) return NOT_EQUAL;
-//   for (var i = 0; i < a.length; i++) {
-//     if (compareEquality(a[i], b[i], cache) === NOT_EQUAL) {
-//       return NOT_EQUAL;
-//     }
-//   }
-//   return EQUAL;
-// }
-
-// function isStructurallyEquatable(value) {
-//   return !(value instanceof Promise // only comparable by reference
-//     || value instanceof WeakMap // only comparable by reference
-//     || value instanceof WeakSet // only comparable by reference
-//     || value instanceof Map // comparable via @@iterator
-//     || value instanceof Set); // comparable via @@iterator
-// }
-
-// function compareStructuralEquality(a, b, cache) {
-//   var aKeys = [];
-//   for (var key in a) aKeys.push(key);
-
-//   var bKeys = [];
-//   for (var key in b) bKeys.push(key);
-
-//   if (aKeys.length !== bKeys.length) {
-//     return NOT_EQUAL;
-//   }
-
-//   aKeys.sort();
-//   bKeys.sort();
-
-//   for (var i = 0; i < aKeys.length; i++) {
-//     var aKey = aKeys[i];
-//     var bKey = bKeys[i];
-//     if (compareEquality(aKey, bKey, cache) === NOT_EQUAL) {
-//       return NOT_EQUAL;
-//     }
-//     if (compareEquality(a[aKey], b[bKey], cache) === NOT_EQUAL) {
-//       return NOT_EQUAL;
-//     }
-//   }
-
-//   return EQUAL;
-// }
-
-// // hack: do iterables via for..of
-// function isIterableEquatable(value) {
-//   try {
-//     for (const _ of value) { break; }
-//     return true;
-//   } catch {
-//     return false;
-//   }
-// }
-
-// function compareIterableEquality(a, b, cache) {
-//   let aValues = [];
-//   for (const x of a) aValues.push(x);
-
-//   let bValues = [];
-//   for (const x of b) bValues.push(x);
-
-//   return compareArrayLikeEquality(aValues, bValues, cache);
-// }
-
-// var __assert_deepEqual__compare = (a, b) => {
-//   return compareEquality(a, b) === EQUAL;
-// };
-
-// var __assert_deepEqual = (actual, expected) => {
-//   if (!assert.deepEqual._compare(actual, expected)) {
-//     throw new Test262Error('assert.deepEqual failed');
-//   }
-// };
-
-// __assert_deepEqual([], []);
-
-// let x = {};
-// x.__proto__ = { wow() { console.log(0); } };
-// Object.defineProperty(x, '__proto__', { value: { wow() { console.log(1); } } });
-// // x.__proto__ = { wow() { console.log(2); } };
-// x.wow();
-
-// var stringSet;
-
-// class C {
-//   get #_() { console.log('get'); return 'get string'; }
-//   set #_(param) { console.log('set', param); stringSet = param; }
-
-//   getPrivateReference() {
-//     return this.#_;
-//   }
-
-//   setPrivateReference(value) {
-//     this.#_ = value;
-//   }
-// };
-
-// var inst = new C();
-// console.log(inst.getPrivateReference());
-// inst.setPrivateReference('set string');
-// console.log(stringSet);
-
-// let o = { set foo(x) { console.log('set foo', x); }, __proto__: { set bar(x) { console.log('set bar', x); } } };
-
-// o.foo = 1;
-// o.bar = 2;
-
-// class C {
-//   // static #method = () => 1;
-//   static #method() {
-//     return 'Test262';
-//   }
-
-//   static getPrivateMethod() {
-//     this.#method = () => 2;
-//     return this.#method();
-//   }
-// }
-
-// console.log(C.getPrivateMethod())
+class C {
+  // static #method = () => 1;
+  static #method() {
+    return 'Test262';
+  }
+
+  static getPrivateMethod() {
+    this.#method = () => 2;
+    return this.#method();
+  }
+}
+
+console.log(C.getPrivateMethod())
 
 // var __assert_throws = (expectedErrorConstructor, func) => {
 //   if (typeof func !== 'function') {

package/runner/index.js

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