porffor 0.59.8 → 0.59.9

package/compiler/codegen.js

@@ -553,9 +553,7 @@ const lookup = (scope, name, failEarly = false) => {
 
   if (!Object.hasOwn(funcIndex, name) && Object.hasOwn(builtinFuncs, name)) {
     includeBuiltin(scope, name);
-  }
-
-  if (Object.hasOwn(internalConstrs, name)) {
+  } else if (Object.hasOwn(internalConstrs, name)) {
     // todo: return an actual something
     return [ number(1) ];
   }
@@ -892,7 +890,21 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
   ];
 };
 
-const concatStrings = (scope, left, right, leftType, rightType) => [
+const concatStrings = (scope, left, right, leftType, rightType) => ((knownType(scope, leftType) | TYPE_FLAGS.parity) === TYPES.bytestring && (knownType(scope, rightType) | TYPE_FLAGS.parity) === TYPES.bytestring) ? [
+  // known types, use strcat direct
+  ...left,
+  Opcodes.i32_to_u,
+  ...leftType,
+
+  ...right,
+  Opcodes.i32_to_u,
+  ...rightType,
+
+  [ Opcodes.call, includeBuiltin(scope, '__Porffor_strcat').index ],
+  ...setLastType(scope),
+  Opcodes.i32_from_u
+] : [
+  // unknown types, check if need to coerce
   ...left,
   ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
   ...leftType,
@@ -1528,8 +1540,9 @@ 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 getInferred = (scope, name, global = false) => {
+  const isConst = getVarMetadata(scope, name, global)?.kind === 'const';
   if (global) {
-    if (globalInfer.has(name) && inferLoopPrev.length === 0) return globalInfer.get(name);
+    if (globalInfer.has(name) && (isConst || inferLoopPrev.length === 0)) return globalInfer.get(name);
   } else if (scope.inferTree) {
     for (let i = scope.inferTree.length - 1; i >= 0; i--) {
       const x = scope.inferTree[i];
@@ -1541,11 +1554,12 @@ const getInferred = (scope, name, global = false) => {
 };
 
 const setInferred = (scope, name, type, global = false) => {
+  const isConst = getVarMetadata(scope, name, global)?.kind === 'const';
   scope.inferTree ??= [];
 
   if (global) {
     // set inferred type in global if not already and not in a loop, else make it null
-    globalInfer.set(name, globalInfer.has(name) || inferLoopPrev.length > 0 ? null : type);
+    globalInfer.set(name, globalInfer.has(name) || (!isConst && inferLoopPrev.length > 0) ? null : type);
   } else {
     // set inferred type in top
     const top = scope.inferTree.at(-1);
@@ -1771,6 +1785,8 @@ const getNodeType = (scope, node) => {
         (knownLeft === TYPES.stringobject || knownRight === TYPES.stringobject)
       ) return TYPES.string;
 
+      if (knownLeft === TYPES.bytestring && knownRight === TYPES.bytestring) return TYPES.bytestring;
+
       // guess bytestring, could really be bytestring or string
       if (knownLeft === TYPES.bytestring || knownRight === TYPES.bytestring)
         guess = TYPES.bytestring;
@@ -2397,6 +2413,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   let idx;
   if (decl._funcIdx) {
     idx = decl._funcIdx;
+  } else if (Object.hasOwn(internalConstrs, name) && !decl._noInternalConstr) {
+    if (decl._new && internalConstrs[name].notConstr) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a constructor`, true);
+    return internalConstrs[name].generate(scope, decl, _global, _name);
   } else if (Object.hasOwn(funcIndex, name)) {
     idx = funcIndex[name];
   } else if (scope.name === name) {
@@ -2410,9 +2429,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
     includeBuiltin(scope, name);
     idx = funcIndex[name];
-  } else if (Object.hasOwn(internalConstrs, name)) {
-    if (decl._new && internalConstrs[name].notConstr) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a constructor`, true);
-    return internalConstrs[name].generate(scope, decl, _global, _name);
   } else if (!decl._new && name && name.startsWith('__Porffor_wasm_')) {
     const wasmOps = {
       // pointer, align, offset
@@ -2559,7 +2575,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...setLastType(scope)
         ],
 
-        default: decl.optional ? withType(scope, [ number(UNDEFINED, Valtype.f64) ], TYPES.undefined)
+        default: () => decl.optional ? withType(scope, [ number(UNDEFINED, Valtype.f64) ], TYPES.undefined)
           : internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, Valtype.f64)
       }, Valtype.f64)
     ];
@@ -3075,6 +3091,11 @@ const allocVar = (scope, name, global = false, type = true, redecl = false, i32
   return idx;
 };
 
+const getVarMetadata = (scope, name, global = false) => {
+  const target = global ? globals : scope.locals;
+  return target[name]?.metadata;
+};
+
 const setVarMetadata = (scope, name, global = false, metadata = {}) => {
   const target = global ? globals : scope.locals;
   target[name].metadata = metadata;
@@ -4041,9 +4062,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           }),
         } : {}),
 
-        [TYPES.undefined]: internalThrow(scope, 'TypeError', 'Cannot set property of undefined', !valueUnused),
+        [TYPES.undefined]: () => internalThrow(scope, 'TypeError', 'Cannot set property of undefined', !valueUnused),
 
-        // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
         default: () => [
           objectGet,
           Opcodes.i32_to,
@@ -4948,7 +4968,7 @@ const generateForOf = (scope, decl) => {
     setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Wasm', wasm: nextWasm }, undefined, true);
   } else {
     // todo: verify this is correct
-    const global = scope.name === '#main' && decl.left.kind === 'var';
+    const global = scope.name === '#main';
     setVar = generateVarDstr(scope, decl.left.kind, decl.left?.declarations?.[0]?.id ?? decl.left, { type: 'Wasm', wasm: nextWasm }, undefined, global);
   }
 
@@ -5015,7 +5035,7 @@ const generateForIn = (scope, decl) => {
     setVar = generateVarDstr(scope, 'var', decl.left, { type: 'Identifier', name: tmpName }, undefined, true);
   } else {
     // todo: verify this is correct
-    const global = scope.name === '#main' && decl.left.kind === 'var';
+    const global = scope.name === '#main';
     setVar = generateVarDstr(scope, decl.left.kind, decl.left?.declarations?.[0]?.id ?? decl.left, { type: 'Identifier', name: tmpName }, undefined, global);
   }
 
@@ -5512,14 +5532,13 @@ const makeData = (scope, elements, page = null, itemType = 'i8') => {
   return { idx, size: bytes.length };
 };
 
-const printStaticStr = str => {
+const printStaticStr = (scope, str) => {
+  scope.usesImports = true;
   const out = [];
 
   for (let i = 0; i < str.length; i++) {
     out.push(
-      // number(str.charCodeAt(i)),
-      number(str.charCodeAt(i), Valtype.i32),
-      [ Opcodes.f64_convert_i32_u ],
+      number(str.charCodeAt(i)),
       [ Opcodes.call, importedFuncs.printChar ]
     );
   }
@@ -6103,7 +6122,7 @@ const generateMember = (scope, decl, _global, _name) => {
       })
     } : {}),
 
-    [TYPES.undefined]: internalThrow(scope, 'TypeError', `Cannot read property of undefined`, true),
+    [TYPES.undefined]: () => internalThrow(scope, 'TypeError', `Cannot read property of undefined`, true),
 
     default: () => [
       ...(coctc > 0 && known === TYPES.object ? [
@@ -7197,10 +7216,8 @@ const internalConstrs = {
 
   __Porffor_printStatic: {
     generate: (scope, decl) => {
-      scope.usesImports = true;
-
       const str = decl.arguments[0].value;
-      const out = printStaticStr(str);
+      const out = printStaticStr(scope, str);
       out.push(number(UNDEFINED));
       return out;
     },
@@ -7248,6 +7265,46 @@ const internalConstrs = {
     }),
     notConstr: true,
     length: 1
+  },
+
+  __console_log: {
+    // compile-time aware console.log to optimize fast paths
+    // todo: this breaks console.group, etc - disable this if those are used but edge case for now
+    generate: (scope, decl) => {
+      const slow = () => {
+        decl._noInternalConstr = true;
+        return generate(scope, decl);
+      };
+      const fast = name => {
+        return [
+          ...generate(scope, {
+            ...decl,
+            callee: {
+              type: 'Identifier',
+              name
+            }
+          }),
+          ...printStaticStr(scope, '\n')
+        ];
+      };
+      if (decl.arguments.length !== 1) return slow();
+
+      generate(scope, decl.arguments[0]); // generate first to get accurate type
+      const type = knownTypeWithGuess(scope, getNodeType(scope, decl.arguments[0]));
+
+      // if we know the type skip the entire print logic, use type's func directly
+      if (type === TYPES.string || type === TYPES.bytestring) {
+        return fast('__Porffor_printString');
+      } else if (type === TYPES.number) {
+        return fast('print');
+      }
+
+      // one arg, skip most of console to avoid rest arg etc
+      return fast('__Porffor_consolePrint');
+    },
+    type: TYPES.undefined,
+    notConstr: true,
+    length: 0
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.59.8",
+  "version": "0.59.9",
   "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.59.8';
+globalThis.version = '0.59.9';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {