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

Partially working, at least for metaprogramming.nom

Browse Source
This commit is contained in:
Bruce Hill 2018-04-17 14:36:44 -07:00
parent 54fc7fc440
commit 26d0de8299
5 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/control_flow.nom
View File

@ -89,14 +89,14 @@ immediately:
compile [repeat while %condition %body] to compile [repeat while %condition %body] to
%lua <-: Lua "while \(%condition as lua expr) do" %lua <-: Lua "while \(%condition as lua expr) do"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and ((%'s stub) is "do next repeat") (%.type = "Action") and ((%'s stub) is "do next repeat")
..: ..:
%lua +<- "\n::continue_repeat::;" %lua +<- "\n::continue_repeat::;"
%lua +<- "\n" %lua +<- "\n"
%lua +<- (%body as lua statements) %lua +<- (%body as lua statements)
%lua +<- "\nend --while-loop" %lua +<- "\nend --while-loop"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and ((%'s stub) is "stop repeating") (%.type = "Action") and ((%'s stub) is "stop repeating")
..: ..:
%lua <- ".." %lua <- ".."
do -- scope of "stop repeating" label do -- scope of "stop repeating" label
@ -112,11 +112,11 @@ immediately:
..to: ..to:
%lua <-: Lua "for i=1,\(%n as lua expr) do" %lua <-: Lua "for i=1,\(%n as lua expr) do"
if %body has subtree % where if %body has subtree % where
(%.type = "FunctionCall") and ((%'s stub) is "do next repeat") (%.type = "Action") and ((%'s stub) is "do next repeat")
..: %lua +<- "\n::continue_repeat::;" ..: %lua +<- "\n::continue_repeat::;"
%lua +<- "\n\(%body as lua statements)\nend --numeric for-loop" %lua +<- "\n\(%body as lua statements)\nend --numeric for-loop"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and ((%'s stub) is "stop repeating") (%.type = "Action") and ((%'s stub) is "stop repeating")
..: ..:
%lua <-: %lua <-:
Lua ".." Lua ".."
@ -145,14 +145,14 @@ immediately:
Lua ".." Lua ".."
for \(%var as lua expr)=\(%start as lua expr),\(%n as lua expr) do for \(%var as lua expr)=\(%start as lua expr),\(%n as lua expr) do
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "do next %") and ((%'s stub) is "do next %") and
%.value.3.value is %var.value %.value.3.value is %var.value
..: %lua write code "\n::continue_\(%var as lua identifier)::;" ..: %lua write code "\n::continue_\(%var as lua identifier)::;"
%lua write code "\n\(%body as lua statements)\nend --numeric for-loop" %lua write code "\n\(%body as lua statements)\nend --numeric for-loop"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and: (%.type = "Action") and:
((%'s stub) is "stop %") and: ((%'s stub) is "stop %") and:
%.value.2.value is %var.value %.value.2.value is %var.value
..: ..:
@ -179,13 +179,13 @@ immediately:
assume (%var.type is "Var") or barf "Loop expected variable, not: \(%var's source code)" assume (%var.type is "Var") or barf "Loop expected variable, not: \(%var's source code)"
%lua <-: Lua "for i,\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do" %lua <-: Lua "for i,\(%var as lua identifier) in ipairs(\(%iterable as lua expr)) do"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "do next %") and ((%'s stub) is "do next %") and
%.value.3.value is %var.value %.value.3.value is %var.value
..: %lua +<- (Lua "\n::continue_\(%var as lua identifier)::;") ..: %lua +<- (Lua "\n::continue_\(%var as lua identifier)::;")
%lua +<- (Lua "\n\(%body as lua statements)\nend --foreach-loop") %lua +<- (Lua "\n\(%body as lua statements)\nend --foreach-loop")
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "stop %") and ((%'s stub) is "stop %") and
%.value.2.value is %var.value %.value.2.value is %var.value
..: ..:
@ -207,13 +207,13 @@ immediately:
assume (%value.type is "Var") or barf "Loop expected variable, not: \(%value's source code)" assume (%value.type is "Var") or barf "Loop expected variable, not: \(%value's source code)"
%lua <- (Lua "for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do") %lua <- (Lua "for \(%key as lua identifier),\(%value as lua identifier) in pairs(\(%iterable as lua expr)) do")
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "do next %") and ((%'s stub) is "do next %") and
%.value.3.value is %key.value %.value.3.value is %key.value
..: %lua +<- (Lua "\n::continue_\(%key as lua identifier)::;") ..: %lua +<- (Lua "\n::continue_\(%key as lua identifier)::;")
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "do next %") and ((%'s stub) is "do next %") and
%.value.3.value is %value.value %.value.3.value is %value.value
..: %lua +<- (Lua "\n::continue_\(%value as lua identifier)::;") ..: %lua +<- (Lua "\n::continue_\(%value as lua identifier)::;")
@ -221,13 +221,13 @@ immediately:
%stop_labels <- "" %stop_labels <- ""
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "stop %") and ((%'s stub) is "stop %") and
%.value.2.value is %key.value %.value.2.value is %key.value
..: %stop_labels +<- "\n::stop_\(%key as lua identifier)::;" ..: %stop_labels +<- "\n::stop_\(%key as lua identifier)::;"
if %body has subtree % where: if %body has subtree % where:
(%.type = "FunctionCall") and (%.type = "Action") and
((%'s stub) is "stop %") and ((%'s stub) is "stop %") and
%.value.2.value is %value.value %.value.2.value is %value.value
..: %stop_labels +<- "\n::stop_\(%value as lua identifier)::;" ..: %stop_labels +<- "\n::stop_\(%value as lua identifier)::;"
@ -249,7 +249,7 @@ immediately:
%is_first <- (yes) %is_first <- (yes)
%seen_else <- (no) %seen_else <- (no)
for %func_call in %body.value: for %func_call in %body.value:
assume (%func_call.type is "FunctionCall") or barf ".." assume (%func_call.type is "Action") or barf ".."
Invalid format for 'when' statement. Only '*' blocks are allowed. Invalid format for 'when' statement. Only '*' blocks are allowed.
with {..} with {..}
%tokens: %func_call.value %tokens: %func_call.value
@ -303,7 +303,7 @@ immediately:
%is_first <- (yes) %is_first <- (yes)
%seen_else <- (no) %seen_else <- (no)
for %func_call in %body.value: for %func_call in %body.value:
assume (%func_call.type is "FunctionCall") or barf ".." assume (%func_call.type is "Action") or barf ".."
Invalid format for 'when' statement. Only '*' blocks are allowed. Invalid format for 'when' statement. Only '*' blocks are allowed.
%tokens <- %func_call.value %tokens <- %func_call.value
with {%star:%tokens.1, %condition:%tokens.2, %action:%tokens.3}: with {%star:%tokens.1, %condition:%tokens.2, %action:%tokens.3}:

5
core/metaprogramming.nom
View File

@ -171,7 +171,6 @@ immediately:
immediately: immediately:
compile [say %message] to: compile [say %message] to:
lua> ".." lua> ".."
local tree = nomsu.compilestack[#nomsu.compilestack];
if \%message.type == "Text" then if \%message.type == "Text" then
return Lua(tree.source, "print(", \(%message as lua expr), ");"); return Lua(tree.source, "print(", \(%message as lua expr), ");");
else else
@ -182,8 +181,8 @@ immediately:
compile [source] to: Lua value (=lua "tree.source") "tree.source" compile [source] to: Lua value (=lua "tree.source") "tree.source"
immediately: immediately:
action [Lua %]: Lua (=lua "nomsu.compilestack[#nomsu.compilestack]") % action [Lua %]: Lua (=lua "tree.source") %
action [Lua value %]: Lua value (=lua "nomsu.compilestack[#nomsu.compilestack]") % action [Lua value %]: Lua value (=lua "tree.source") %
# Return # Return
immediately: immediately:

2
nomsu.lua
View File

@ -1292,7 +1292,7 @@ if arg and debug_getinfo(2).func ~= require then
return line_table return line_table
end end
}) })
debug.getinfo = function(thread, f, what) debug.getinfoXXXXXX = function(thread, f, what)
if what == nil then if what == nil then
f, what, thread = thread, f, nil f, what, thread = thread, f, nil
end end

3
nomsu.moon
View File

@ -37,6 +37,7 @@ debug_getinfo = debug.getinfo
-- Maybe do some sort of lazy definitions of actions that defer until they're used in code -- Maybe do some sort of lazy definitions of actions that defer until they're used in code
-- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution -- Add a ((%x foo %y) where {x:"asdf", y:"fdsa"}) compile-time action for substitution
-- Allow plain text backslash like: "\n" in longstrings without requiring "\\n" -- Allow plain text backslash like: "\n" in longstrings without requiring "\\n"
-- Maybe support some kind of regex action definitions like "foo %first (and %next)*"?
export FILE_CACHE export FILE_CACHE
FILE_CACHE = setmetatable {}, { FILE_CACHE = setmetatable {}, {
@ -892,7 +893,7 @@ if arg and debug_getinfo(2).func != require
return line_table return line_table
} }
debug.getinfo = (thread,f,what)-> debug.getinfoXXXXXX = (thread,f,what)->
if what == nil if what == nil
f,what,thread = thread,f,nil f,what,thread = thread,f,nil
if type(f) == 'number' then f += 1 -- Account for this wrapper function if type(f) == 'number' then f += 1 -- Account for this wrapper function

8
nomsu_tree.moon
View File

@ -65,7 +65,7 @@ Tree "Block",
lua\append line_lua lua\append line_lua
return lua return lua
math_patt = re.compile [[ "%" (" " [*/^+-] " %")+ ]] math_expression = re.compile [[ "%" (" " [*/^+-] " %")+ ]]
Tree "Action", Tree "Action",
as_lua: (nomsu)=> as_lua: (nomsu)=>
stub = @get_stub! stub = @get_stub!
@ -77,10 +77,12 @@ Tree "Action",
if metadata.arg_orders if metadata.arg_orders
new_args = [args[p-1] for p in *metadata.arg_orders[stub]] new_args = [args[p-1] for p in *metadata.arg_orders[stub]]
args = new_args args = new_args
return action(Lua(@source), unpack(args)) -- Force Lua to avoid tail call optimization for debugging purposes
ret = action(Lua(@source), unpack(args))
return ret
lua = Lua.Value(@source) lua = Lua.Value(@source)
if not metadata and math_patt\match(stub) if not metadata and math_expression\match(stub)
-- This is a bit of a hack, but this code handles arbitrarily complex -- This is a bit of a hack, but this code handles arbitrarily complex
-- math expressions like 2*x + 3^2 without having to define a single -- math expressions like 2*x + 3^2 without having to define a single
-- action for every possibility. -- action for every possibility.