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

More cleanup and fixes for core stuff.

Browse Source
This commit is contained in:
Bruce Hill 2017-09-11 13:16:58 -07:00
parent 5fef795cda
commit 26e8ee58b3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core.moon
View File

@ -127,7 +127,7 @@ g\defmacro "return %retval", (vars, kind)=>
g\defmacro "let %varname = %value", (vars, kind)=> g\defmacro "let %varname = %value", (vars, kind)=>
if kind == "Expression" if kind == "Expression"
error("Cannot set a variable in an expression.") error("Cannot set a variable in an expression.")
return "vars[#{@tree_to_lua(vars.varname)}] = #{@tree_to_lua(vars.value)}" return "vars[#{@tree_to_lua(vars.varname)}] = #{@tree_to_lua(vars.value)}", true
singleton = (aliases, value)-> singleton = (aliases, value)->
g\defmacro aliases, ((vars)=> value) g\defmacro aliases, ((vars)=> value)
@ -231,23 +231,25 @@ g\defmacro "for %varname in %iterable %body", (vars, kind)=>
if kind == "Expression" if kind == "Expression"
return " return "
(function(game, vars) (function(game, vars)
local comprehension, vars = {}, setmetatable({}, {__index=vars}) local comprehension, old_loopval = {}, vars[#{@tree_to_lua(vars.varname)}]
for i, value in ipairs(#{@tree_to_lua(vars.iterable)}) do for i, value in ipairs(#{@tree_to_lua(vars.iterable)}) do
local ret local ret
vars[#{@tree_to_lua(vars.varname)}] = value vars[#{@tree_to_lua(vars.varname)}] = value
#{@tree_to_lua(vars.body.value)} #{@tree_to_lua(vars.body.value.value)}
table.insert(comprehension, ret) table.insert(comprehension, ret)
end end
vars[#{@tree_to_lua(vars.varname)}] = old_loopval
return comprehension return comprehension
end)(game, vars)" end)(game, vars)"
else else
return " return "
do do
local comprehension, vars = {}, setmetatable({}, {__index=vars}) local comprehension, old_loopval = {}, vars[#{@tree_to_lua(vars.varname)}]
for i, value in ipairs(#{@tree_to_lua(vars.iterable)}) do for i, value in ipairs(#{@tree_to_lua(vars.iterable)}) do
vars[#{@tree_to_lua(vars.varname)}] = value vars[#{@tree_to_lua(vars.varname)}] = value
#{@tree_to_lua(vars.body.value)} #{@tree_to_lua(vars.body.value.value)}
end end
vars[#{@tree_to_lua(vars.varname)}] = old_loopval
end", true end", true
g\simplemacro "for %varname = %start to %stop %body", [[for %varname in (lua ["utils.range(",%start,",",%stop,")"]) %body]] g\simplemacro "for %varname = %start to %stop %body", [[for %varname in (lua ["utils.range(",%start,",",%stop,")"]) %body]]
@ -273,7 +275,7 @@ g\defmacro [[macro %spec %body]], (vars, kind)=>
g\defmacro [[test %code yields %tree]], (vars, kind)=> g\defmacro [[test %code yields %tree]], (vars, kind)=>
if kind == "Expression" then error("Tests must be statements.") if kind == "Expression" then error("Tests must be statements.")
got = self\stringify_tree(vars.code.value) got = self\stringify_tree(vars.code.value)
got = got\match("Thunk:\n (.*)")\gsub("\n ","\n") got = got\match("Thunk:\n (.*)")\gsub("\n ","\n")
got = utils.repr(got,true) got = utils.repr(got,true)
expected = @tree_to_lua(vars.tree) expected = @tree_to_lua(vars.tree)
return " return "
@ -281,7 +283,7 @@ do
local got = #{got} local got = #{got}
local expected = #{expected} local expected = #{expected}
if got ~= expected then if got ~= expected then
error('Test failed. Expected:\n'..expected..'\n\nButGot:\n'..got) error('Test failed. Expected:\\n'..expected..'\\n\\nBut got:\\n'..got)
end end
end", true end", true