Fix luac-lex in face of gc, run lexers for bootrt in parallel

Author: serprex

.gitignore

@@ -2,5 +2,5 @@
 quire.js
 rt.wasm
 scripts/lex.wasm
-bootrt.lua
+./bootrt.lua
 lua-5.3.4-tests/

luart/bootrt.lua

@@ -0,0 +1,98 @@
+local astgen = require 'astgen'
+local bcgen = require 'bcgen'
+
+return function(...)
+	local result = {}
+	local prevsult = {
+		integer = {},
+		float = {},
+		string = {},
+	}
+
+	local funcnums, funcprefix
+	local strconst = {}
+	local function func2lua(func, toplevel)
+		local name = funcprefix .. funcnums
+		funcnums = funcnums + 1
+		local subfuncs = {}
+		local consts = {}
+		for i=1, #func.consts do
+			local c = func.consts[i]
+			local ct = math.type(c) or type(c)
+			consts[#consts+1] = strconst[ct](c)
+		end
+		if #consts == 0 then
+			consts = nil
+		end
+		result[#result+1] = {
+			name,
+			#func.params,
+			func.isdotdotdot,
+			string.char(table.unpack(func.bc)),
+			consts,
+			#func.locals,
+		}
+		return name
+	end
+	function strconst.integer(c)
+		if prevsult.integer[c] then
+			return prevsult.integer[c]
+		else
+			local pack = string.pack('<i8', c)
+			result[#result+1] = c
+			prevsult.integer[c] = function() return GN.integer[pack] end
+			return prevsult.integer[c]
+		end
+	end
+	function strconst.float(c)
+		if prevsult.float[c] then
+			return prevsult.float[c]
+		else
+			local pack = string.pack('<d', c)
+			result[#result+1] = c
+			prevsult.float[c] = function() return GN.float[pack] end
+			return prevsult.float[c]
+		end
+	end
+	function strconst.string(c)
+		if prevsult.string[c] then
+			return prevsult.string[c]
+		else
+			result[#result+1] = c
+			prevsult.string[c] = function() return GS[c] end
+			return prevsult.string[c]
+		end
+	end
+	function strconst.table(c)
+		local pack = func2lua(c)
+		return function() return GF[pack] end
+	end
+	local lexers = {}
+	for i=1,select('#', ...) do
+		local srcfile = select(i, ...)
+		lexers[srcfile] = io.popen("./scripts/luac-lex.js '" .. srcfile:gsub("'", "'\\''") .. "'")
+	end
+	for i=1,select('#', ...) do
+		local srcfile = select(i, ...)
+		local data = lexers[srcfile]:read('a')
+		local lx, offs = string.unpack('<s4', data)
+		local vlen, offs = string.unpack('<i4', data, offs)
+		local vals = {}
+		for i=1,vlen do
+			local ty = data:byte(offs)
+			if ty == 0 then
+				vals[i], offs = string.unpack('<i8', data, offs+1)
+			elseif ty == 1 then
+				vals[i], offs = string.unpack('<d', data, offs+1)
+			else
+				vals[i], offs = string.unpack('<s4', data, offs+1)
+			end
+		end
+
+		funcnums = 0
+		funcprefix = srcfile:gsub('^.*/(.*)%.lua$', '%1')
+		print(funcprefix)
+		func2lua(bcgen(astgen(lx, vals)))
+	end
+	return result
+end

luart/util.lua

@@ -8,7 +8,7 @@ I'll try avoid my usual stream of consciousness here, instead that's at [my devl
 
 WASM runtime is in `rt/`. [`rt/make.lua`](rt/make.lua) is the entry point for the assmembler. This produces an `rt.wasm` which [`rt.js`](rt.js) contains glue code for
 
-The GC is a LISP2 compacting GC. GC performance is a low priority given the WASM GC RFC
+The GC is a LISP2 compacting GC. GC performance is a low priority given the WASM GC RFC. See [`rt/gc.lua`](rt/gc.lua)
 
 The VM needs to be reentrant. The currently running coroutine is oluastack. Builtins which call functions work by returning after setting up a necessary callstack. See [`rt/vm.lua`](rt/vm.lua)
 

readme.md

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 const fs = require('fs'),
+	util = require('../util'),
 	{ promisify } = require('util'),
 	readFile = promisify(fs.readFile);
 

scripts/luac-lex.js

@@ -104,9 +104,14 @@ end
 function strconst.table(c)
 	return 'function() return GF.' .. func2lua(c) .. ' end'
 end
+local lexers = {}
 for i=2,select('#', ...) do
 	local srcfile = select(i, ...)
-	local data = io.popen("./scripts/luac-lex.js '" .. srcfile:gsub("'", "'\\''") .. "'"):read('a')
+	lexers[srcfile] = io.popen("./scripts/luac-lex.js '" .. srcfile:gsub("'", "'\\''") .. "'")
+end
+for i=2,select('#', ...) do
+	local srcfile = select(i, ...)
+	local data = lexers[srcfile]:read('a')
 	local lx, offs = string.unpack('<s4', data)
 	local vlen, offs = string.unpack('<i4', data, offs)
 	local vals = {}