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

Fixed some bugs.

Browse Source
This commit is contained in:
Bruce Hill 2018-06-12 20:15:52 -07:00
parent 63a19db0dc
commit 968b5da150
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/metaprogramming.nom
View File

@ -5,10 +5,10 @@
# Compile-time action to make compile-time actions: # Compile-time action to make compile-time actions:
immediately immediately
lua> ".." lua> ".."
_ENV['ACTION'..string.as_lua_id("compile % to %")] = function(tree, \%actions, \%lua) _ENV['ACTION'..string.as_lua_id("compile % to %")] = compile_time(function(tree, \%actions, \%lua)
local lua = Lua(tree.source) local lua = Lua(tree.source)
local canonical = \%actions[1] local canonical = \%actions[1]
lua:append("ACTION", string.as_lua_id(canonical.stub), ' = function(tree') lua:append("ACTION", string.as_lua_id(canonical.stub), ' = compile_time(function(tree')
local args = {} local args = {}
for i,tok in ipairs(canonical) do for i,tok in ipairs(canonical) do
if tok.type == "Var" then args[#args+1] = tok end if tok.type == "Var" then args[#args+1] = tok end
@ -21,8 +21,7 @@ immediately
local body_lua = nomsu:tree_to_lua(\%lua):as_statements("return ") local body_lua = nomsu:tree_to_lua(\%lua):as_statements("return ")
body_lua:remove_free_vars(args) body_lua:remove_free_vars(args)
body_lua:declare_locals() body_lua:declare_locals()
lua:append(")\n ", body_lua, "\nend") lua:append(")\n ", body_lua, "\nend)")
lua:append("\nCOMPILE_TIME[ACTION", string.as_lua_id(canonical.stub), "] = true")
for i=2,#\%actions do for i=2,#\%actions do
local action = \%actions[i] local action = \%actions[i]
@ -35,7 +34,6 @@ immediately
end end
end end
lua:append("\n", "ARG_ORDERS[", repr(action.stub), "] = ", repr(arg_positions)) lua:append("\n", "ARG_ORDERS[", repr(action.stub), "] = ", repr(arg_positions))
lua:append("\nCOMPILE_TIME[ACTION", string.as_lua_id(action.stub), "] = true")
end end
lua:append("\nALIASES[ACTION", string.as_lua_id(canonical.stub), "] = {") lua:append("\nALIASES[ACTION", string.as_lua_id(canonical.stub), "] = {")
for i,action in ipairs(\%actions) do for i,action in ipairs(\%actions) do
@ -44,8 +42,7 @@ immediately
end end
lua:append("}") lua:append("}")
return lua return lua
end end)
COMPILE_TIME[_ENV['ACTION'..string.as_lua_id("compile % to %")]] = true
# Compile-time action to make actions # Compile-time action to make actions
immediately immediately
@ -95,7 +92,7 @@ immediately
lua> ".." lua> ".."
local lua = Lua(tree.source) local lua = Lua(tree.source)
local canonical = \%shorthand[1] local canonical = \%shorthand[1]
lua:append("ACTION", string.as_lua_id(canonical.stub), ' = function(tree') lua:append("ACTION", string.as_lua_id(canonical.stub), ' = compile_time(function(tree')
local args = {} local args = {}
for i,tok in ipairs(canonical) do for i,tok in ipairs(canonical) do
if tok.type == "Var" then args[#args+1] = tok end if tok.type == "Var" then args[#args+1] = tok end
@ -129,8 +126,7 @@ immediately
return t.type.."("..table.concat(bits, ", ")..")" return t.type.."("..table.concat(bits, ", ")..")"
end end
end end
lua:append(")\n local tree = ", make_tree(\%longhand), "\n return nomsu:tree_to_lua(tree)\nend") lua:append(")\n local tree = ", make_tree(\%longhand), "\n return nomsu:tree_to_lua(tree)\nend)")
lua:append("\nCOMPILE_TIME[ACTION", string.as_lua_id(canonical.stub), "] = true")
for i=2,#\%shorthand do for i=2,#\%shorthand do
local action = \%shorthand[i] local action = \%shorthand[i]
@ -143,7 +139,6 @@ immediately
end end
end end
lua:append("\n", "ARG_ORDERS[", repr(action.stub), "] = ", repr(arg_positions)) lua:append("\n", "ARG_ORDERS[", repr(action.stub), "] = ", repr(arg_positions))
lua:append("\nCOMPILE_TIME[ACTION", string.as_lua_id(action.stub), "] = true")
end end
lua:append("\nALIASES[ACTION", string.as_lua_id(canonical.stub), "] = {") lua:append("\nALIASES[ACTION", string.as_lua_id(canonical.stub), "] = {")
for i,action in ipairs(\%shorthand) do for i,action in ipairs(\%shorthand) do

4
nomsu.lua
View File

@ -1288,6 +1288,10 @@ do
self.environment.ALIASES = setmetatable({ }, { self.environment.ALIASES = setmetatable({ }, {
__mode = "k" __mode = "k"
}) })
self.environment.compile_time = function(fn)
self.environment.COMPILE_TIME[fn] = true
return fn
end
self.environment.COMPILE_TIME = { } self.environment.COMPILE_TIME = { }
self.environment.LOADED = { } self.environment.LOADED = { }
self.environment.AST = AST self.environment.AST = AST

3
nomsu.moon
View File

@ -283,6 +283,9 @@ class NomsuCompiler
@environment.Source = Source @environment.Source = Source
@environment.ARG_ORDERS = setmetatable({}, {__mode:"k"}) @environment.ARG_ORDERS = setmetatable({}, {__mode:"k"})
@environment.ALIASES = setmetatable({}, {__mode:"k"}) @environment.ALIASES = setmetatable({}, {__mode:"k"})
@environment.compile_time = (fn)->
@environment.COMPILE_TIME[fn] = true
return fn
@environment.COMPILE_TIME = {} @environment.COMPILE_TIME = {}
@environment.LOADED = {} @environment.LOADED = {}
@environment.AST = AST @environment.AST = AST