porffor 0.1.1 → 0.2.0-c6c8c81

package/rhemyn/test/parse.js

@@ -0,0 +1,59 @@
+import util from 'node:util';
+
+import parse from '../parse.js';
+
+const tests = {
+  'a': {},
+  'a(b)': {},
+  'a(b(c))': {},
+  'ab': {},
+  '[ab]': {},
+  '[a-z]': {},
+  'a*': {},
+  'a+': {},
+  'a?': {},
+  'a(b)+': {},
+  '[^a]': {},
+  '[a^]': {},
+  '[^ab]': {},
+  '.': {},
+
+  // not range
+  '[-]': {},
+  '[0-]': {},
+  '[-0]': {},
+  '[\\s-\\S]': {},
+  '[\\s-.]': {},
+
+  '[\\S]': {},
+
+  '\\c': {},
+  '\\c0': {},
+  '\\cJ': {},
+
+  '\\x': {},
+  '\\x0': {},
+  '\\x0g': {},
+  '\\x0a': {},
+
+  '\\u': {},
+  '\\u0': {},
+  '\\u000': {},
+  '\\u000g': {},
+  '\\u000a': {},
+
+  /*
+  // email regexes
+  '^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$': {},
+
+  // input type=email from HTML spec
+  // https://html.spec.whatwg.org/multipage/input.html#email-state-(type=email)
+  // simpler form
+  '^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\\.[a-zA-Z0-9-]+)*$': {},
+  // full/complex form
+  '^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$': {}*/
+};
+
+for (const str in tests) {
+  console.log(str, util.inspect(parse(str), false, null, true));
+}

package/runner/index.js

@@ -1,32 +1,55 @@
-import compile from '../compiler/wrap.js';
-import fs from 'node:fs';
-
-const file = process.argv.slice(2).find(x => x[0] !== '-');
-if (!file) {
-  // run repl if no file given
-  await import('./repl.js');
-
-  // do nothing for the rest of this file
-  await new Promise(() => {});
-}
-
-const source = fs.readFileSync(file, 'utf8');
-
-let cache = '';
-const print = str => {
-  cache += str;
-
-  if (str === '\n') {
-    process.stdout.write(cache);
-    cache = '';
-  }
-};
-
-try {
-  const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
-
-  exports.main();
-  if (cache) process.stdout.write(cache);
-} catch (e) {
-  console.error(`${e.constructor.name}: ${e.message}`);
+#!/usr/bin/env node
+
+import compile from '../compiler/wrap.js';
+import fs from 'node:fs';
+
+if (process.argv.includes('-compile-hints')) {
+  const v8 = await import('node:v8');
+  v8.setFlagsFromString(`--experimental-wasm-compilation-hints`);
+
+  // see also these flags:
+  // --experimental-wasm-branch-hinting
+  // --experimental-wasm-extended-const
+  // --experimental-wasm-inlining (?)
+  // --experimental-wasm-js-inlining (?)
+  // --experimental-wasm-return-call (on by default)
+}
+
+const file = process.argv.slice(2).find(x => x[0] !== '-');
+if (!file) {
+  if (process.argv.includes('-v')) {
+    // just print version
+    console.log((await import('./version.js')).default);
+    process.exit(0);
+  }
+
+  // run repl if no file given
+  await import('./repl.js');
+
+  // do nothing for the rest of this file
+  await new Promise(() => {});
+}
+
+const source = fs.readFileSync(file, 'utf8');
+
+let cache = '';
+const print = str => {
+  /* cache += str;
+
+  if (str === '\n') {
+    process.stdout.write(cache);
+    cache = '';
+  } */
+
+  process.stdout.write(str);
+};
+
+try {
+  const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
+
+  if (!process.argv.includes('-no-run')) exports.main();
+  if (cache) process.stdout.write(cache);
+} catch (e) {
+  if (cache) process.stdout.write(cache);
+  console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
 }

package/runner/info.js

@@ -36,7 +36,7 @@ const print = str => {
 };
 
 const t0 = performance.now();
-const { wasm, exports } = await compile(source, raw ? [ 'module' ] : [ 'module', 'info' ], {}, print);
+const { wasm, exports, pages } = await compile(source, raw ? [ 'module' ] : [ 'module', 'info' ], {}, print);
 
 if (!raw && typeof Deno === 'undefined') fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
@@ -51,4 +51,39 @@ if (!process.argv.includes('-no-run')) {
 }
 
 if (!raw) console.log(bold(`wasm binary is ${wasm.byteLength} bytes`));
-if (!raw) console.log(`total: ${(performance.now() - t0).toFixed(2)}ms`);
+if (!raw) console.log(`total: ${(performance.now() - t0).toFixed(2)}ms`);
+
+if (!raw && process.argv.includes('-mem') && exports.$) {
+  console.log();
+
+  let lastMemory, lastPages;
+  const PageSize = 65536;
+  const memoryToString = mem => {
+    let out = '';
+    const pages = lastPages.length;
+    const wasmPages = mem.buffer.byteLength / PageSize;
+
+    out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m for ${pages} things using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n`;
+
+    const buf = new Uint8Array(mem.buffer);
+
+    for (let i = 0; i < pages; i++) {
+      out += `\x1B[36m${lastPages[i]}\x1B[2m | \x1B[0m`;
+
+      for (let j = 0; j < 50; j++) {
+        const val = buf[i * pageSize + j];
+        if (val === 0) out += '\x1B[2m';
+        out += val.toString(16).padStart(2, '0');
+        if (val === 0) out += '\x1B[0m';
+        out += ' ';
+      }
+      out += '\n';
+    }
+
+    return out;
+  };
+
+  lastPages = [...pages.keys()];
+  lastMemory = exports.$;
+  console.log(memoryToString(lastMemory));
+}

package/runner/profile.js

@@ -32,8 +32,7 @@ const t1 = performance.now();
 const { instance } = await WebAssembly.instantiate(wasm, {
   '': {
     p: i => print(Number(i).toString()),
-    c: i => print(String.fromCharCode(Number(i))),
-    a: c => { if (!Number(c)) throw new Error(`assert failed`); }
+    c: i => print(String.fromCharCode(Number(i)))
   }
 });
 csv += `inst,${performance.now() - t1}\n`;

package/runner/repl.js

@@ -1,9 +1,7 @@
 import compile from '../compiler/wrap.js';
+import rev from './version.js';
 
 import repl from 'node:repl';
-import fs from 'node:fs';
-
-const rev = fs.readFileSync('.git/refs/heads/main', 'utf8').trim();
 
 // process.argv.push('-O0'); // disable opts
 
@@ -23,7 +21,7 @@ const memoryToString = mem => {
   const pages = lastPages.length;
   const wasmPages = mem.buffer.byteLength / PageSize;
 
-  out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m for ${pages} things using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n`;
+  out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KB\x1B[0m for ${pages} thing${pages === 1 ? '' : 's'} using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'}\n`;
 
   const buf = new Uint8Array(mem.buffer);
 
@@ -45,13 +43,18 @@ const memoryToString = mem => {
 
 let prev = '';
 const run = async (source, _context, _filename, callback, run = true) => {
-  let toRun = prev + source.trim();
-  prev = toRun + ';\n';
+  // hack: print "secret" before latest code ran to only enable printing for new code
+
+  let toRun = prev + `;\nprint(-0x1337);\n` + source.trim();
 
-  const { exports, wasm, pages } = await compile(toRun, []);
-  fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  let shouldPrint = false;
+  const { exports, wasm, pages } = await compile(toRun, [], {}, str => {
+    if (shouldPrint) process.stdout.write(str);
+    if (str === '-4919') shouldPrint = true;
+  });
+  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
-  if (exports.$) {
+  if (run && exports.$) {
     lastMemory = exports.$;
     lastPages = [...pages.keys()];
   }
@@ -59,8 +62,7 @@ const run = async (source, _context, _filename, callback, run = true) => {
   const ret = run ? exports.main() : undefined;
   callback(null, ret);
 
-  // if (source.includes(' = ') || source.includes('let ') || source.includes('var ') || source.includes('const ')) prev += source + ';\n';
-  // prev = toRun + ';\n';
+  prev = prev + ';\n' + source.trim();
 };
 
 const replServer = repl.start({ prompt: '> ', eval: run });