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

Added dict comprehension and abbreviated loop forms.

Browse Source
This commit is contained in:
Bruce Hill 2017-09-14 06:23:50 -07:00
parent c595e57942
commit bce6cd2e21
1 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
core.nom
View File

@ -161,7 +161,17 @@ macro block "for %varname in %iterable %body":
| vars[\%varname\] = old_loopval
|end
# Comprehension
macro block "for all %iterable %body":
".."|do
| local old_loopval = vars.it
| for i,value in ipairs(\%iterable as lua expr\) do
| vars.it = value
| \(lua expr "vars.body.value.value") as lua block\
| end
| vars.it = old_loopval
|end
# List Comprehension
# TODO: maybe make this lazy, or a lazy version?
macro "%expression for %varname in %iterable":
".."|(function(game, vars)
@ -173,6 +183,37 @@ macro "%expression for %varname in %iterable":
| return comprehension
|end)(game, setmetatable({}, {__index=vars}))
macro "%expression for all %iterable":
".."|(function(game, vars)
| local comprehension = {}
| for i,value in ipairs(\%iterable as lua expr\) do
| vars.it = value
| comprehension[i] = \%expression as lua expr\
| end
| return comprehension
|end)(game, setmetatable({}, {__index=vars}))
# Dict comprehension
macro "%key = %value for %varname in %iterable":
".."|(function(game, vars)
| local comprehension = {}
| for i,value in ipairs(\%iterable as lua expr\) do
| vars[\%varname as lua expr\] = value
| comprehension[\%key as lua expr\] = \%value as lua expr\
| end
| return comprehension
|end)(game, setmetatable({}, {__index=vars}))
macro "%key = %value for all %iterable":
".."|(function(game, vars)
| local comprehension = {}
| for i,value in ipairs(\%iterable as lua expr\) do
| vars.it = value
| comprehension[\%key as lua expr\] = \%value as lua expr\
| end
| return comprehension
|end)(game, setmetatable({}, {__index=vars}))
# Number ranges
rule "%start up to %stop":
lua expr "utils.range(vars.start,vars.stop-1)"