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

Incremental progress.

Browse Source
This commit is contained in:
Bruce Hill 2018-04-12 20:39:17 -07:00
parent 1de29826a8
commit b05a46c78c
4 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/metaprogramming.nom
View File

@ -49,9 +49,9 @@ immediately:
lua:append(arg); lua:append(arg);
if i < #args then lua:append(", ") end if i < #args then lua:append(", ") end
end end
local body_lua = nomsu:tree_to_lua(\%lua):as_statements(); local body_lua = nomsu:tree_to_lua(\%body):as_statements();
body_lua:declare_locals(args); body_lua:declare_locals(args);
lua:append("\\n ", body_lua, "\\nend);") lua:append(")\\n ", body_lua, "\\nend);")
return lua; return lua;
# Macro to make nomsu macros: # Macro to make nomsu macros:

22
lua_obj.moon
View File

@ -5,7 +5,12 @@ export LINE_STARTS
Location = immutable {"text_name","text","start","stop"}, { Location = immutable {"text_name","text","start","stop"}, {
name:"Location" name:"Location"
__new: (text_name, text, start, stop)=> text_name, text, start, stop or start __new: (text_name, text, start, stop)=>
assert(type(text_name) == 'string')
assert(type(text) == 'string')
assert(type(start) == 'number')
assert(type(stop or start) == 'number')
return text_name, text, start, stop or start
__tostring: => "#{@text_name}[#{@start}:#{@stop}]" __tostring: => "#{@text_name}[#{@start}:#{@stop}]"
__lt: (other)=> __lt: (other)=>
assert(@text == other.text, "Cannot compare sources from different texts") assert(@text == other.text, "Cannot compare sources from different texts")
@ -28,9 +33,9 @@ Location = immutable {"text_name","text","start","stop"}, {
while (line_starts[stop_line+1] or (#src+1)) <= @stop while (line_starts[stop_line+1] or (#src+1)) <= @stop
stop_line += 1 stop_line += 1
return start_line, stop_line return start_line, stop_line
get_line: => "#{@text_name}:#{@get_line_number}" get_line: => "#{@text_name}:#{@get_line_number!}"
get_line_range: => get_line_range: =>
start_line, stop_line = @get_line_number start_line, stop_line = @get_line_number!
return if stop_line == start_line return if stop_line == start_line
"#{text_name}:#{start_line}" "#{text_name}:#{start_line}"
else "#{text_name}:#{start_line}-#{stop_line}" else "#{text_name}:#{start_line}-#{stop_line}"
@ -41,6 +46,9 @@ class Lua
is_value: false is_value: false
new: (@source, ...)=> new: (@source, ...)=>
for i=1,select("#",...)
x = select(i,...)
assert(type(x) != 'table' or getmetatable(x))
@bits = {...} @bits = {...}
@free_vars = {} @free_vars = {}
@ -81,14 +89,20 @@ class Lua
n = select("#",...) n = select("#",...)
bits = @bits bits = @bits
for i=1,n for i=1,n
x = select(i,...)
assert(type(x) != 'table' or getmetatable(x))
bits[#bits+1] = select(i, ...) bits[#bits+1] = select(i, ...)
prepend: (...)=> prepend: (...)=>
n = select("#",...) n = select("#",...)
bits = @bits bits = @bits
for i=#bits+n,n+1,-1 for i=#bits+n,n+1,-1
x = select(i,...)
assert(type(x) != 'table' or getmetatable(x))
bits[i] = bits[i-n] bits[i] = bits[i-n]
for i=1,n for i=1,n
x = select(i,...)
assert(type(x) != 'table' or getmetatable(x))
bits[i] = select(i, ...) bits[i] = select(i, ...)
make_offset_table: (lua_chunkname)=> make_offset_table: (lua_chunkname)=>
@ -132,7 +146,7 @@ class LuaValue extends Lua
as_statements: => as_statements: =>
bits = {unpack @bits} bits = {unpack @bits}
bits[#bits+1] = ";" bits[#bits+1] = ";"
return Lua(@source, bits) return Lua(@source, unpack(bits))
parenthesize: => parenthesize: =>
@prepend "(" @prepend "("

46
nomsu.lua
View File

@ -973,11 +973,9 @@ do
return lua return lua
end end
local args = { } local args = { }
local _list_1 = tree.value for i, tok in ipairs(tree.value) do
for _index_0 = 1, #_list_1 do
local _continue_0 = false local _continue_0 = false
repeat repeat
local i, tok = _list_1[_index_0]
if tok.type == "Word" then if tok.type == "Word" then
_continue_0 = true _continue_0 = true
break break
@ -998,9 +996,9 @@ do
do do
local _accum_0 = { } local _accum_0 = { }
local _len_0 = 1 local _len_0 = 1
local _list_2 = metadata.arg_orders[stub] local _list_1 = metadata.arg_orders[stub]
for _index_0 = 1, #_list_2 do for _index_0 = 1, #_list_1 do
local p = _list_2[_index_0] local p = _list_1[_index_0]
_accum_0[_len_0] = args[p] _accum_0[_len_0] = args[p]
_len_0 = _len_0 + 1 _len_0 = _len_0 + 1
end end
@ -1612,26 +1610,22 @@ if arg and debug_getinfo(2).func ~= require then
if not info or not info.func then if not info or not info.func then
return info return info
end end
do if info.short_src or info.source or info.linedefine or info.currentline then
local metadata = nomsu.action_metadata[info.func] do
if metadata then local metadata = nomsu.action_metadata[info.func]
info.name = metadata.aliases[1] if metadata then
end info.name = metadata.aliases[1]
end local filename = metadata.source:match("^[^[:]*")
local is_nomsu, nomsu_line = pcall(lua_line_to_nomsu_line, info.short_src, info.linedefined) info.short_src = filename
if is_nomsu then info.source = FILE_CACHE[filename]
if info.source:sub(1, 1) == "@" then local linedefined
error("Not-yet-loaded source: " .. tostring(info.source)) ok, linedefined = pcall(lua_line_to_nomsu_line, info.short_src, info.linedefined)
end if ok then
info.linedefined = nomsu_line info.linedefined = linedefined
info.currentline = lua_line_to_nomsu_line(info.short_src, info.currentline) end
info.short_src = metadata.source.text_name local currentline
info.source = metadata.source.text ok, currentline = pcall(lua_line_to_nomsu_line, info.short_src, info.currentline)
else end
if info.short_src and info.short_src:match("^.*%.moon$") then
local line_table = moonscript_line_tables[info.short_src]
local file = FILE_CACHE[info.short_src]
info.source = file or info.source
end end
end end
return info return info

26
nomsu.moon
View File

@ -714,7 +714,7 @@ class NomsuCompiler
return lua return lua
args = {} args = {}
for i, tok in *tree.value for i, tok in ipairs tree.value
if tok.type == "Word" then continue if tok.type == "Word" then continue
arg_lua = @tree_to_lua(tok) arg_lua = @tree_to_lua(tok)
unless arg_lua.is_value unless arg_lua.is_value
@ -1093,20 +1093,16 @@ if arg and debug_getinfo(2).func != require
debug_getinfo(f,what) debug_getinfo(f,what)
else debug_getinfo(thread,f,what) else debug_getinfo(thread,f,what)
if not info or not info.func then return info if not info or not info.func then return info
if metadata = nomsu.action_metadata[info.func] if info.short_src or info.source or info.linedefine or info.currentline
info.name = metadata.aliases[1] if metadata = nomsu.action_metadata[info.func]
is_nomsu, nomsu_line = pcall(lua_line_to_nomsu_line, info.short_src, info.linedefined) info.name = metadata.aliases[1]
if is_nomsu filename = metadata.source\match("^[^[:]*")
if info.source\sub(1,1) == "@" then error("Not-yet-loaded source: #{info.source}") info.short_src = filename
info.linedefined = nomsu_line info.source = FILE_CACHE[filename]
info.currentline = lua_line_to_nomsu_line(info.short_src, info.currentline) ok, linedefined = pcall(lua_line_to_nomsu_line, info.short_src, info.linedefined)
info.short_src = metadata.source.text_name if ok then info.linedefined = linedefined
info.source = metadata.source.text ok, currentline = pcall(lua_line_to_nomsu_line, info.short_src, info.currentline)
else --if ok then info.currentline = currentline
if info.short_src and info.short_src\match("^.*%.moon$")
line_table = moonscript_line_tables[info.short_src]
file = FILE_CACHE[info.short_src]
info.source = file or info.source
return info return info