porffor 0.2.0-fdf0fc5 → 0.14.0-032e4ad08

package/runner/repl.js

@@ -1,8 +1,10 @@
+import { TYPE_NAMES } from '../compiler/types.js';
 import compile from '../compiler/wrap.js';
-import rev from './version.js';
+import version from './version.js';
 
-// import repl from 'node:repl';
-// import repl from '../../node-repl-polyfill/index.js';
+import util from 'node:util';
+
+process.argv.push('--no-opt-unused');
 
 let repl;
 try {
@@ -17,8 +19,6 @@ try {
   repl = (await import('node-repl-polyfill')).default;
 }
 
-// process.argv.push('-O0'); // disable opts
-
 globalThis.valtype = 'f64';
 
 const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
@@ -32,7 +32,7 @@ if (host.startsWith('Node')) host = '\x1B[92m' + host;
 if (host.startsWith('Deno')) host = '\x1B[97m' + host;
 if (host.startsWith('Bun')) host = '\x1B[93m' + host;
 
-console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[90m(${rev.slice(0, 7)})\x1B[0m running on \x1B[1m${host.replace('/', ' \x1B[0m\x1B[90m(')})\x1B[0m`);
+console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[90m(${version})\x1B[0m running on \x1B[1m${host.replace('/', ' \x1B[0m\x1B[90m(')})\x1B[0m`);
 console.log(`\x1B[90musing opt ${process.argv.find(x => x.startsWith('-O')) ?? '-O1'}, parser ${parser}, valtype ${valtype}\x1B[0m`);
 console.log();
 
@@ -81,21 +81,31 @@ const run = async (source, _context, _filename, callback, run = true) => {
   let toRun = (prev ? (prev + `;\nprint(-0x1337);\n`) : '') + source.trim();
 
   let shouldPrint = !prev;
-  const { exports, wasm, pages } = await compile(toRun, [], {}, str => {
+  const { exports, pages } = await compile(toRun, [], {}, str => {
     if (shouldPrint) process.stdout.write(str);
     if (str === '-4919') shouldPrint = true;
   });
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   if (run && exports.$) {
     lastMemory = exports.$;
     lastPages = [...pages.keys()];
   }
 
-  const ret = run ? exports.main() : undefined;
-  callback(null, ret);
+  let ret = run ? exports.main() : undefined;
+  let value, type;
+  if (ret?.type != null) {
+    value = ret.value;
+    type = ret.type;
+    ret = ret.js;
+  }
+
+  console.log(util.inspect(ret, false, 2, true), (value != null ? `\x1B[34m\x1B[3m(value: ${value}, type: ${TYPE_NAMES[type]})\x1B[0m` : ''));
+
+  // callback(null, ret);
 
   prev = prev + ';\n' + source.trim();
+
+  callback();
 };
 
 const replServer = repl.start({ prompt: '> ', eval: run });

package/runner/sizes.js

@@ -1,5 +1,5 @@
-import fs from 'node:fs';
 import compile from '../compiler/index.js';
+import fs from 'node:fs';
 
 // deno compat
 const textEncoder = new TextEncoder();
@@ -18,7 +18,7 @@ const perform = async (file, args) => {
   console.log(label, ' '.repeat(40 - label.length), `${size}b`);
 };
 
-const argsValtypes = [ '--valtype=i32', '--valtype=i64', '--valtype=f64' ];
+const argsValtypes = [ '--valtype=i32', '--valtype=f64' ];
 const argsOptlevels = [ '-O0', '-O1', '-O2', '-O3' ];
 
 for (const file of [ 'bench/prime_basic.js', 'bench/fib_iter.js', 'test/math_1.js', 'test/math_3.js', 'test/while_1.js', 'test/for_2.js', 'test/unary_3.js', 'test/updateexp_1.js', 'test/eq_3.js', 'test/empty.js' ]) {

package/runner/version.js

@@ -1,10 +1,12 @@
-import fs from 'node:fs';
+import { readFileSync } from 'node:fs';
 
-let rev = 'unknown';
-try {
-  rev = JSON.parse(fs.readFileSync(new URL('../package.json', import.meta.url), 'utf8')).version.split('-')[1].slice(0, 7);
-} catch {
-  rev = fs.readFileSync(new URL('../.git/refs/heads/main', import.meta.url), 'utf8').trim().slice(0, 7);
-}
+export let version = 'unknown';
+export let rev = 'unknown';
 
-export default rev;
+const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
+version = packageJson.version.split('-')[0];
+rev = packageJson.version.split('-')[1];
+
+if (!rev) rev = readFileSync(new URL('../.git/refs/heads/main', import.meta.url), 'utf8').trim().slice(0, 9);
+
+export default `${version}-${rev}`;