Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleaning up.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-18 15:45:58 -07:00
parent 16f3a189fd
commit ec17442090
4 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lua_obj.lua
View File

@ -150,13 +150,17 @@ do
_class_0 = setmetatable({ _class_0 = setmetatable({
__init = function(self, source, ...) __init = function(self, source, ...)
self.source = source self.source = source
if type(self.source) == 'string' then
local filename, start, stop = self.source:match("^(.-)[(%d+):(%d+)]$")
self.source = Source(filename, tonumber(start), tonumber(stop))
end
self.bits = { self.bits = {
... ...
} }
if type(self.source) == 'string' then
local filename, start, stop = self.source:match("^(.-)[(%d+):(%d+)]$")
if start or stop then
self.source = Source(filename, tonumber(start), tonumber(stop))
else
self.source = Source(self.source, 1, #self)
end
end
end, end,
__base = _base_0, __base = _base_0,
__name = "Code" __name = "Code"

7
lua_obj.moon
View File

@ -62,10 +62,13 @@ Source = immutable {"filename","start","stop"}, {
class Code class Code
new: (@source, ...)=> new: (@source, ...)=>
@bits = {...}
if type(@source) == 'string' if type(@source) == 'string'
filename,start,stop = @source\match("^(.-)[(%d+):(%d+)]$") filename,start,stop = @source\match("^(.-)[(%d+):(%d+)]$")
@source = Source(filename, tonumber(start), tonumber(stop)) if start or stop
@bits = {...} @source = Source(filename, tonumber(start), tonumber(stop))
else
@source = Source(@source, 1, #self)
clone: => clone: =>
cls = @__class cls = @__class

37
nomsu.lua
View File

@ -61,7 +61,16 @@ local line_counter = re.compile([[ lines <- {| line (%nl line)* |}
LINE_STARTS = setmetatable({ }, { LINE_STARTS = setmetatable({ }, {
__mode = "k", __mode = "k",
__index = function(self, k) __index = function(self, k)
local line_starts = line_counter:match(tostring(k)) if type(k) ~= 'string' then
k = tostring(k)
do
local v = rawget(self, k)
if v then
return v
end
end
end
local line_starts = line_counter:match(k)
self[k] = line_starts self[k] = line_starts
return line_starts return line_starts
end end
@ -203,7 +212,7 @@ end
local NomsuCompiler local NomsuCompiler
do do
local _class_0 local _class_0
local stub_defs, stub_pattern, var_pattern local _nomsu_chunk_counter, stub_defs, stub_pattern, var_pattern
local _base_0 = { local _base_0 = {
define_action = function(self, signature, source, fn) define_action = function(self, signature, source, fn)
if type(fn) ~= 'function' then if type(fn) ~= 'function' then
@ -330,11 +339,14 @@ do
assert(tree, "In file " .. tostring(colored.blue(filename)) .. " failed to parse:\n" .. tostring(colored.onyellow(colored.black(nomsu_code)))) assert(tree, "In file " .. tostring(colored.blue(filename)) .. " failed to parse:\n" .. tostring(colored.onyellow(colored.black(nomsu_code))))
return tree return tree
end, end,
run = function(self, nomsu_code, source) run = function(self, nomsu_code)
if type(source) == 'string' then if type(nomsu_code) == 'string' then
source = Source(source, 1, #nomsu_code) _nomsu_chunk_counter = _nomsu_chunk_counter + 1
local filename = "<nomsu chunk #" .. tostring(_nomsu_chunk_counter) .. ">.nom"
nomsu_code = Nomsu(filename, nomsu_code)
FILE_CACHE[filename] = nomsu_code
end end
if nomsu_code == "" then if #nomsu_code == 0 then
return nil return nil
end end
local tree = self:parse(nomsu_code, source) local tree = self:parse(nomsu_code, source)
@ -367,14 +379,14 @@ do
local lua_filename = filename:gsub("%.nom$", ".lua") local lua_filename = filename:gsub("%.nom$", ".lua")
local file = FILE_CACHE[lua_filename] local file = FILE_CACHE[lua_filename]
if file then if file then
return self:run_lua(file, lua_filename) return self:run_lua(file)
end end
end end
local file = file or FILE_CACHE[filename] local file = file or FILE_CACHE[filename]
if not file then if not file then
error("File does not exist: " .. tostring(filename), 0) error("File does not exist: " .. tostring(filename), 0)
end end
return self:run(file, filename) return self:run(file)
else else
return error("Invalid filetype for " .. tostring(filename), 0) return error("Invalid filetype for " .. tostring(filename), 0)
end end
@ -1226,6 +1238,7 @@ do
}) })
_base_0.__class = _class_0 _base_0.__class = _class_0
local self = _class_0 local self = _class_0
_nomsu_chunk_counter = 0
self.unescape_string = function(self, str) self.unescape_string = function(self, str)
return Cs(((P("\\\\") / "\\") + (P("\\\"") / '"') + NOMSU_DEFS.escaped_char + P(1)) ^ 0):match(str) return Cs(((P("\\\\") / "\\") + (P("\\\"") / '"') + NOMSU_DEFS.escaped_char + P(1)) ^ 0):match(str)
end end
@ -1353,7 +1366,7 @@ if arg and debug_getinfo(2).func ~= require then
else else
local retval, code local retval, code
if args.input == '-' then if args.input == '-' then
retval, code = nomsu:run(io.read('a'), 'stdin') retval, code = nomsu:run(io.read('a'))
else else
retval, code = nomsu:run_file(args.input) retval, code = nomsu:run_file(args.input)
end end
@ -1367,7 +1380,7 @@ if arg and debug_getinfo(2).func ~= require then
end end
end end
if args.flags["-i"] then if args.flags["-i"] then
nomsu:run('use "core"', "stdin") nomsu:run('use "core"')
while true do while true do
io.write(colored.bright(colored.yellow(">> "))) io.write(colored.bright(colored.yellow(">> ")))
local buff = "" local buff = ""
@ -1384,9 +1397,7 @@ if arg and debug_getinfo(2).func ~= require then
break break
end end
local ret local ret
ok, ret = pcall(function() ok, ret = pcall(nomsu.run, nomsu, buff)
return nomsu:run(buff, "stdin")
end)
if ok and ret ~= nil then if ok and ret ~= nil then
print("= " .. repr(ret)) print("= " .. repr(ret))
elseif not ok then elseif not ok then

31
nomsu.moon
View File

@ -41,6 +41,7 @@ debug_getinfo = debug.getinfo
-- Re-implement nomsu-to-lua comment translation -- Re-implement nomsu-to-lua comment translation
export FILE_CACHE export FILE_CACHE
-- FILE_CACHE is a map from filename (string) -> file contents (Lua or Nomsu object)
FILE_CACHE = setmetatable {}, { FILE_CACHE = setmetatable {}, {
__index: (filename)=> __index: (filename)=>
file = io.open(filename) file = io.open(filename)
@ -62,10 +63,16 @@ line_counter = re.compile([[
]], nl:P("\r")^-1 * P("\n")) ]], nl:P("\r")^-1 * P("\n"))
-- Mapping from line number -> character offset -- Mapping from line number -> character offset
export LINE_STARTS export LINE_STARTS
-- LINE_STARTS is a mapping from strings to a table that maps line number to character positions
LINE_STARTS = setmetatable {}, { LINE_STARTS = setmetatable {}, {
__mode:"k" __mode:"k"
__index: (k)=> __index: (k)=>
line_starts = line_counter\match(tostring(k)) -- Implicitly convert Lua and Nomsu objects to strings
if type(k) != 'string'
k = tostring(k)
if v = rawget(self, k)
return v
line_starts = line_counter\match(k)
self[k] = line_starts self[k] = line_starts
return line_starts return line_starts
} }
@ -297,10 +304,14 @@ class NomsuCompiler
assert tree, "In file #{colored.blue filename} failed to parse:\n#{colored.onyellow colored.black nomsu_code}" assert tree, "In file #{colored.blue filename} failed to parse:\n#{colored.onyellow colored.black nomsu_code}"
return tree return tree
run: (nomsu_code, source)=> _nomsu_chunk_counter = 0
if type(source) == 'string' run: (nomsu_code)=>
source = Source(source,1,#nomsu_code) if type(nomsu_code) == 'string'
if nomsu_code == "" then return nil _nomsu_chunk_counter += 1
filename = "<nomsu chunk ##{_nomsu_chunk_counter}>.nom"
nomsu_code = Nomsu(filename, nomsu_code)
FILE_CACHE[filename] = nomsu_code
if #nomsu_code == 0 then return nil
tree = @parse(nomsu_code, source) tree = @parse(nomsu_code, source)
assert tree, "Failed to parse: #{nomsu_code}" assert tree, "Failed to parse: #{nomsu_code}"
assert tree.type == "File", "Attempt to run non-file: #{tree.type}" assert tree.type == "File", "Attempt to run non-file: #{tree.type}"
@ -328,11 +339,11 @@ class NomsuCompiler
lua_filename = filename\gsub("%.nom$", ".lua") lua_filename = filename\gsub("%.nom$", ".lua")
file = FILE_CACHE[lua_filename] file = FILE_CACHE[lua_filename]
if file if file
return @run_lua(file, lua_filename) return @run_lua(file)
file = file or FILE_CACHE[filename] file = file or FILE_CACHE[filename]
if not file if not file
error("File does not exist: #{filename}", 0) error("File does not exist: #{filename}", 0)
return @run(file, filename) return @run(file)
else else
error("Invalid filetype for #{filename}", 0) error("Invalid filetype for #{filename}", 0)
@ -939,7 +950,7 @@ if arg and debug_getinfo(2).func != require
else else
local retval, code local retval, code
if args.input == '-' if args.input == '-'
retval, code = nomsu\run(io.read('a'), 'stdin') retval, code = nomsu\run(io.read('a'))
else else
retval, code = nomsu\run_file(args.input) retval, code = nomsu\run_file(args.input)
if compiled_output if compiled_output
@ -951,7 +962,7 @@ if arg and debug_getinfo(2).func != require
if args.flags["-i"] if args.flags["-i"]
-- REPL -- REPL
nomsu\run('use "core"', "stdin") nomsu\run('use "core"')
while true while true
io.write(colored.bright colored.yellow ">> ") io.write(colored.bright colored.yellow ">> ")
buff = "" buff = ""
@ -964,7 +975,7 @@ if arg and debug_getinfo(2).func != require
io.write(colored.dim colored.yellow ".. ") io.write(colored.dim colored.yellow ".. ")
if #buff == 0 if #buff == 0
break break
ok, ret = pcall(-> nomsu\run(buff, "stdin")) ok, ret = pcall(nomsu.run, nomsu, buff)
if ok and ret != nil if ok and ret != nil
print "= "..repr(ret) print "= "..repr(ret)
elseif not ok elseif not ok