porffor 0.2.0-cb647c8 → 0.2.0-dcc06c8

package/README.md

@@ -272,7 +272,7 @@ Basically none right now (other than giving people headaches). Potential ideas:
 - More in future probably?
 
 ## VSCode extension
-There is a vscode extension in `porffor-for-vscode` which tweaks JS syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
+There is a vscode extension in `vscode-ext` which tweaks JS syntax highlighting to be nicer with porffor features (eg highlighting wasm inside of inline asm).
 
 ## Isn't this the same as AssemblyScript/other Wasm langs?
 No. they are not alike at all internally and have very different goals/ideals:

package/compiler/builtins/base64.ts

@@ -2,12 +2,12 @@
 
 import type { i32, bytestring } from './porffor.d.ts';
 
-const keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+export const btoa = (input: bytestring): bytestring => {
+  const keyStr: bytestring = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
 
-const btoa = (input: bytestring): bytestring => {
   // todo: throw invalid character for unicode
 
-  let output: bytestring = "";
+  let output: bytestring = '';
   let i: i32 = 0;
 
   while (i < input.length) {
@@ -27,6 +27,26 @@ const btoa = (input: bytestring): bytestring => {
       enc4 = 64;
     }
 
+    // const endPtr: i32 = output.length * 2;
+
+    // smile :)
+//     Porffor.wasm`local.get ${enc1}
+// i32.to_u
+// i32.const 2
+// i32.mul
+// local.get ${keyStr}
+// i32.to_u
+// i32.add
+// i32.load16_u 0 4
+
+// local.get ${output}
+// i32.to_u
+// local.get ${endPtr}
+// i32.to_u
+// i32.add
+
+// i32.store16 0 4`;
+
     output += keyStr.charAt(enc1);
     output += keyStr.charAt(enc2);
     output += keyStr.charAt(enc3);

package/compiler/builtins/porffor.d.ts

@@ -1,2 +1,10 @@
 export type i32 = number;
-export type bytestring = string;
+export type bytestring = string;
+
+type PorfforGlobal = {
+  wasm: (...args: any[]) => void;
+};
+
+declare global {
+  const Porffor: PorfforGlobal;
+}

package/compiler/builtins.js

@@ -1,5 +1,6 @@
 import { Blocktype, Opcodes, Valtype, ValtypeSize } from "./wasmSpec.js";
 import { number, i32x4 } from "./embedding.js";
+import Prefs from './prefs.js';
 
 export const importedFuncs = [
   {
@@ -685,7 +686,7 @@ export const BuiltinFuncs = function() {
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
     returns: [ valtypeBinary ],
-    returnType: process.argv.includes('-bytestring') ? '_bytestring' : 'string',
+    returnType: Prefs.bytestring ? '_bytestring' : 'string',
     wasm: (scope, { TYPE_NAMES, typeSwitch, makeString }) => {
       const bc = {};
       for (const x in TYPE_NAMES) {

package/compiler/codeGen.js

@@ -7,6 +7,7 @@ import { number, i32x4, enforceOneByte, enforceTwoBytes, enforceFourBytes, enfor
 import { log } from "./log.js";
 import parse from "./parse.js";
 import * as Rhemyn from "../rhemyn/compile.js";
+import Prefs from './prefs.js';
 
 let globals = {};
 let globalInd = 0;
@@ -160,7 +161,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
     case 'TaggedTemplateExpression': {
       const funcs = {
-        __Porffor_asm: str => {
+        __Porffor_wasm: str => {
           let out = [];
 
           for (const line of str.split('\n')) {
@@ -179,7 +180,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
             }
 
             if (asm[0] === 'memory') {
-              allocPage('asm instrinsic');
+              allocPage(scope, 'asm instrinsic');
               // todo: add to store/load offset insts
               continue;
             }
@@ -214,13 +215,23 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       // hack for inline asm
       if (!funcs[name]) return todo('tagged template expressions not implemented');
 
-      const str = decl.quasi.quasis[0].value.raw;
+      const { quasis, expressions } = decl.quasi;
+      let str = quasis[0].value.raw;
+
+      for (let i = 0; i < expressions.length; i++) {
+        const e = expressions[i];
+        str += lookupName(scope, e.name)[0];
+
+        str += quasis[i + 1].value.raw;
+      }
+
       return funcs[name](str);
     }
 
     default:
-      if (decl.type.startsWith('TS')) {
-        // ignore typescript nodes
+      // ignore typescript nodes
+      if (decl.type.startsWith('TS') ||
+          decl.type === 'ImportDeclaration' && decl.importKind === 'type') {
         return [];
       }
 
@@ -409,9 +420,6 @@ const concatStrings = (scope, left, right, global, name, assign) => {
   const rightLength = localTmp(scope, 'concat_right_length', Valtype.i32);
   const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
 
-  const aotWFA = process.argv.includes('-aot-well-formed-string-approximation');
-  if (aotWFA) addVarMeta(name, { wellFormed: undefined });
-
   if (assign) {
     const pointer = arrays.get(name ?? '$undeclared');
 
@@ -785,11 +793,14 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     return performLogicOp(scope, op, left, right, leftType, rightType);
   }
 
+  const knownLeft = knownType(scope, leftType);
+  const knownRight = knownType(scope, rightType);
+
   const eqOp = ['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(op);
   const strictOp = op === '===' || op === '!==';
 
   const startOut = [], endOut = [];
-  const finalise = out => startOut.concat(out, endOut);
+  const finalize = out => startOut.concat(out, endOut);
 
   // if strict (in)equal check types match
   if (strictOp) {
@@ -834,31 +845,32 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
   // todo: if equality op and an operand is undefined, return false
   // todo: niche null hell with 0
 
-  // if (leftType === TYPES.string || rightType === TYPES.string) {
-  //   if (op === '+') {
-  //     // string concat (a + b)
-  //     return finalise(concatStrings(scope, left, right, _global, _name, assign));
-  //   }
-
-  //   // not an equality op, NaN
-  //   if (!eqOp) return finalise(number(NaN));
-
-  //   // else leave bool ops
-  //   // todo: convert string to number if string and number/bool
-  //   // todo: string (>|>=|<|<=) string
-
-  //   // string comparison
-  //   if (op === '===' || op === '==') {
-  //     return finalise(compareStrings(scope, left, right));
-  //   }
-
-  //   if (op === '!==' || op === '!=') {
-  //     return finalise([
-  //       ...compareStrings(scope, left, right),
-  //       [ Opcodes.i32_eqz ]
-  //     ]);
-  //   }
-  // }
+  // todo: this should be dynamic but for now only static
+  if (knownLeft === TYPES.string || knownRight === TYPES.string) {
+    if (op === '+') {
+      // string concat (a + b)
+      return concatStrings(scope, left, right, _global, _name, assign);
+    }
+
+    // not an equality op, NaN
+    if (!eqOp) return number(NaN);
+
+    // else leave bool ops
+    // todo: convert string to number if string and number/bool
+    // todo: string (>|>=|<|<=) string
+
+    // string comparison
+    if (op === '===' || op === '==') {
+      return compareStrings(scope, left, right);
+    }
+
+    if (op === '!==' || op === '!=') {
+      return [
+        ...compareStrings(scope, left, right),
+        [ Opcodes.i32_eqz ]
+      ];
+    }
+  }
 
   let ops = operatorOpcode[valtype][op];
 
@@ -868,7 +880,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     includeBuiltin(scope, builtinName);
     const idx = funcIndex[builtinName];
 
-    return finalise([
+    return finalize([
       ...left,
       ...right,
       [ Opcodes.call, idx ]
@@ -883,9 +895,6 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
   let tmpLeft, tmpRight;
   // if equal op, check if strings for compareStrings
   if (op === '===' || op === '==' || op === '!==' || op === '!=') (() => {
-    const knownLeft = knownType(scope, leftType);
-    const knownRight = knownType(scope, rightType);
-
     // todo: intelligent partial skip later
     // if neither known are string, stop this madness
     if ((knownLeft != null && knownLeft !== TYPES.string) && (knownRight != null && knownRight !== TYPES.string)) {
@@ -943,7 +952,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     // }
   })();
 
-  return finalise([
+  return finalize([
     ...left,
     ...(tmpLeft != null ? stringOnly([ [ Opcodes.local_tee, tmpLeft ] ]) : []),
     ...right,
@@ -1086,7 +1095,10 @@ const TYPE_NAMES = {
 const getType = (scope, _name) => {
   const name = mapName(_name);
 
+  if (typedInput && scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
   if (scope.locals[name]) return [ [ Opcodes.local_get, scope.locals[name + '#type'].idx ] ];
+
+  if (typedInput && globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
   if (globals[name]) return [ [ Opcodes.global_get, globals[name + '#type'].idx ] ];
 
   let type = TYPES.undefined;
@@ -1227,6 +1239,14 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'BinaryExpression') {
       if (['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(node.operator)) return TYPES.boolean;
+      if (node.operator !== '+') return TYPES.number;
+
+      const knownLeft = knownType(scope, getNodeType(scope, node.left));
+      const knownRight = knownType(scope, getNodeType(scope, node.right));
+
+      // todo: this should be dynamic but for now only static
+      if (knownLeft === TYPES.string || knownRight === TYPES.string) return TYPES.string;
+
       return TYPES.number;
 
       // todo: string concat types
@@ -1251,7 +1271,7 @@ const getNodeType = (scope, node) => {
       if (node.operator === '!') return TYPES.boolean;
       if (node.operator === 'void') return TYPES.undefined;
       if (node.operator === 'delete') return TYPES.boolean;
-      if (node.operator === 'typeof') return process.argv.includes('-bytestring') ? TYPES._bytestring : TYPES.string;
+      if (node.operator === 'typeof') return Prefs.bytestring ? TYPES._bytestring : TYPES.string;
 
       return TYPES.number;
     }
@@ -1654,7 +1674,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
   const typedParams = userFunc || builtinFuncs[name]?.typedParams;
-  const typedReturn = userFunc || builtinFuncs[name]?.typedReturn;
+  const typedReturns = userFunc || builtinFuncs[name]?.typedReturns;
   const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
 
   let args = decl.arguments;
@@ -1678,7 +1698,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   out.push([ Opcodes.call, idx ]);
 
-  if (!typedReturn) {
+  if (!typedReturns) {
     // let type;
     // if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
     // if (internalConstrs[name]) type = internalConstrs[name].type;
@@ -1814,14 +1834,14 @@ const brTable = (input, bc, returns) => {
 };
 
 const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
-  if (!process.argv.includes('-bytestring')) delete bc[TYPES._bytestring];
+  if (!Prefs.bytestring) delete bc[TYPES._bytestring];
 
   const known = knownType(scope, type);
   if (known != null) {
     return bc[known] ?? bc.default;
   }
 
-  if (process.argv.includes('-typeswitch-use-brtable'))
+  if (Prefs.typeswitchUseBrtable)
     return brTable(type, bc, returns);
 
   const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
@@ -1856,7 +1876,7 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
   return out;
 };
 
-const allocVar = (scope, name, global = false) => {
+const allocVar = (scope, name, global = false, type = true) => {
   const target = global ? globals : scope.locals;
 
   // already declared
@@ -1870,8 +1890,10 @@ const allocVar = (scope, name, global = false) => {
   let idx = global ? globalInd++ : scope.localInd++;
   target[name] = { idx, type: valtypeBinary };
 
-  let typeIdx = global ? globalInd++ : scope.localInd++;
-  target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
+  if (type) {
+    let typeIdx = global ? globalInd++ : scope.localInd++;
+    target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
+  }
 
   return idx;
 };
@@ -1914,7 +1936,7 @@ const extractTypeAnnotation = decl => {
   const typeName = type;
   type = typeAnnoToPorfType(type);
 
-  if (type === TYPES._bytestring && !process.argv.includes('-bytestring')) type = TYPES.string;
+  if (type === TYPES._bytestring && !Prefs.bytestring) type = TYPES.string;
 
   // if (decl.name) console.log(decl.name, { type, elementType });
 
@@ -1949,7 +1971,7 @@ const generateVar = (scope, decl) => {
       continue; // always ignore
     }
 
-    let idx = allocVar(scope, name, global);
+    let idx = allocVar(scope, name, global, !x.id.typeAnnotation);
 
     if (typedInput && x.id.typeAnnotation) {
       addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
@@ -2546,6 +2568,9 @@ const generateThrow = (scope, decl) => {
   let exceptId = exceptions.push({ constructor, message }) - 1;
   let tagIdx = tags[0].idx;
 
+  scope.exceptions ??= [];
+  scope.exceptions.push(exceptId);
+
   // todo: write a description of how this works lol
 
   return [
@@ -2590,7 +2615,7 @@ const generateAssignPat = (scope, decl) => {
 };
 
 let pages = new Map();
-const allocPage = (reason, type) => {
+const allocPage = (scope, reason, type) => {
   if (pages.has(reason)) return pages.get(reason).ind;
 
   if (reason.startsWith('array:')) pages.hasArray = true;
@@ -2601,16 +2626,20 @@ const allocPage = (reason, type) => {
   const ind = pages.size;
   pages.set(reason, { ind, type });
 
-  if (allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
+  scope.pages ??= new Map();
+  scope.pages.set(reason, { ind, type });
+
+  if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
 
   return ind;
 };
 
+// todo: add scope.pages
 const freePage = reason => {
   const { ind } = pages.get(reason);
   pages.delete(reason);
 
-  if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
+  if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
 
   return ind;
 };
@@ -2667,7 +2696,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
     const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
-    arrays.set(name, allocPage(`${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
+    arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
   }
 
   const pointer = arrays.get(name);
@@ -2687,10 +2716,13 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
       bytes.push(...compileBytes(elements[i], itemType));
     }
 
-    data.push({
+    const ind = data.push({
       offset: pointer,
       bytes
-    });
+    }) - 1;
+
+    scope.data ??= [];
+    scope.data.push(ind);
 
     // local value as pointer
     out.push(...number(pointer));
@@ -2724,7 +2756,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 };
 
 const byteStringable = str => {
-  if (!process.argv.includes('-bytestring')) return false;
+  if (!Prefs.bytestring) return false;
 
   for (let i = 0; i < str.length; i++) {
     if (str.charCodeAt(i) > 0xFF) return false;
@@ -2735,7 +2767,7 @@ const byteStringable = str => {
 
 const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
   const rawElements = new Array(str.length);
-  let byteStringable = process.argv.includes('-bytestring');
+  let byteStringable = Prefs.bytestring;
   for (let i = 0; i < str.length; i++) {
     const c = str.charCodeAt(i);
     rawElements[i] = c;
@@ -2896,7 +2928,7 @@ const objectHack = node => {
     if (!objectName) return node;
 
     const name = '__' + objectName + '_' + node.property.name;
-    if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
+    if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 
     return {
       type: 'Identifier',
@@ -3123,7 +3155,7 @@ export default program => {
     body: program.body
   };
 
-  if (process.argv.includes('-ast-log')) console.log(program.body.body);
+  if (Prefs.astLog) console.log(program.body.body);
 
   generateFunc(scope, program);
 

package/compiler/generated_builtins.js

@@ -0,0 +1,3 @@
+
+export const BuiltinFuncs = function() {
+};

package/compiler/index.js

@@ -5,6 +5,7 @@ import opt from './opt.js';
 import produceSections from './sections.js';
 import decompile from './decompile.js';
 import toc from './2c.js';
+import Prefs from './prefs.js';
 
 globalThis.decompile = decompile;
 
@@ -25,17 +26,10 @@ const logFuncs = (funcs, globals, exceptions) => {
   console.log();
 };
 
-const getArg = name => process.argv.find(x => x.startsWith(`-${name}=`))?.slice(name.length + 2);
-
 const writeFileSync = (typeof process?.version !== 'undefined' ? (await import('node:fs')).writeFileSync : undefined);
 const execSync = (typeof process?.version !== 'undefined' ? (await import('node:child_process')).execSync : undefined);
 
 export default (code, flags) => {
-  globalThis.optLog = process.argv.includes('-opt-log');
-  globalThis.codeLog = process.argv.includes('-code-log');
-  globalThis.allocLog = process.argv.includes('-alloc-log');
-  globalThis.regexLog = process.argv.includes('-regex-log');
-
   const t0 = performance.now();
   const program = parse(code, flags);
   if (flags.includes('info')) console.log(`1. parsed in ${(performance.now() - t0).toFixed(2)}ms`);
@@ -44,19 +38,19 @@ export default (code, flags) => {
   const { funcs, globals, tags, exceptions, pages, data } = codeGen(program);
   if (flags.includes('info')) console.log(`2. generated code in ${(performance.now() - t1).toFixed(2)}ms`);
 
-  if (process.argv.includes('-funcs')) logFuncs(funcs, globals, exceptions);
+  if (Prefs.funcs) logFuncs(funcs, globals, exceptions);
 
   const t2 = performance.now();
-  opt(funcs, globals, pages, tags);
+  opt(funcs, globals, pages, tags, exceptions);
   if (flags.includes('info')) console.log(`3. optimized code in ${(performance.now() - t2).toFixed(2)}ms`);
 
-  if (process.argv.includes('-opt-funcs')) logFuncs(funcs, globals, exceptions);
+  if (Prefs.optFuncs) logFuncs(funcs, globals, exceptions);
 
   const t3 = performance.now();
   const sections = produceSections(funcs, globals, tags, pages, data, flags);
   if (flags.includes('info')) console.log(`4. produced sections in ${(performance.now() - t3).toFixed(2)}ms`);
 
-  if (allocLog) {
+  if (Prefs.allocLog) {
     const wasmPages = Math.ceil((pages.size * pageSize) / 65536);
     const bytes = wasmPages * 65536;
     log('alloc', `\x1B[1mallocated ${bytes / 1024}KiB\x1B[0m for ${pages.size} things using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}`);
@@ -65,8 +59,8 @@ export default (code, flags) => {
 
   const out = { wasm: sections, funcs, globals, tags, exceptions, pages, data };
 
-  const target = getArg('target') ?? getArg('t') ?? 'wasm';
-  const outFile = getArg('o');
+  const target = Prefs.target ?? 'wasm';
+  const outFile = Prefs.o;
 
   if (target === 'wasm' && outFile) {
     writeFileSync(outFile, Buffer.from(sections));
@@ -88,8 +82,8 @@ export default (code, flags) => {
   }
 
   if (target === 'native') {
-    let compiler = getArg('compiler') ?? 'clang';
-    const cO = getArg('cO') ?? 'Ofast';
+    let compiler = Prefs.compiler ?? 'clang';
+    const cO = Prefs._cO ?? 'Ofast';
 
     if (compiler === 'zig') compiler = [ 'zig', 'cc' ];
       else compiler = [ compiler ];