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

Added more parens and semicolons, and made "#" work with "..."

Browse Source
This commit is contained in:
Bruce Hill 2019-02-05 14:22:48 -08:00
parent 5f6aae8d9d
commit 0ff3219f35
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/core/operators.nom
View File

@ -70,7 +70,7 @@ test:
if \$var.type == 'Var' then if \$var.type == 'Var' then
lua:add_free_vars({var_lua:text()}) lua:add_free_vars({var_lua:text()})
end end
lua:add(' = ', \($value as lua expr)) lua:add(' = ', \($value as lua expr), ';')
end end
return lua return lua
") ")
@ -107,8 +107,7 @@ test:
end end
") ")
return return Lua ("
Lua ("
do do
\$defs \$defs
\($body as lua) \($body as lua)
@ -120,7 +119,7 @@ test:
unless ((5 wrapped around 2) == 1): unless ((5 wrapped around 2) == 1):
fail "mod not working" fail "mod not working"
[$x wrapped around $y, $x mod $y] all compile to [$x wrapped around $y, $x mod $y, $x % $y] all compile to
"((\($x as lua expr)) % (\($y as lua expr)))" "((\($x as lua expr)) % (\($y as lua expr)))"
# 3-part chained comparisons # 3-part chained comparisons
@ -200,7 +199,7 @@ lua> "if \((is jit) or ($(LUA API) == "Lua 5.2")) then"
"Bit.rshift(\($x as lua expr), \($shift as lua expr))" "Bit.rshift(\($x as lua expr), \($shift as lua expr))"
lua> "else" lua> "else"
[NOT $, ~ $] all compile to "~(\($ as lua expr))" [NOT $, ~ $] all compile to "(~(\($ as lua expr)))"
[$x OR $y, $x | $y] all compile to "(\($x as lua expr) | \($y as lua expr))" [$x OR $y, $x | $y] all compile to "(\($x as lua expr) | \($y as lua expr))"
[$x XOR $y, $x ~ $y] all compile to "(\($x as lua expr) ~ \($y as lua expr))" [$x XOR $y, $x ~ $y] all compile to "(\($x as lua expr) ~ \($y as lua expr))"
[$x AND $y, $x & $y] all compile to "(\($x as lua expr) & \($y as lua expr))" [$x AND $y, $x & $y] all compile to "(\($x as lua expr) & \($y as lua expr))"
@ -216,13 +215,21 @@ lua> "end"
test: test:
assume ((- 5) == -5) assume ((- 5) == -5)
assume ((not (yes)) == (no)) assume ((not (yes)) == (no))
(- $) compiles to "(- \($ as lua expr))" (- $) compiles to "(-(\($ as lua expr)))"
(not $) compiles to "(not \($ as lua expr))" (not $) compiles to "(not \($ as lua expr))"
test: test:
assume ((size of [1, 2, 3]) == 3) assume ((size of [1, 2, 3]) == 3)
assume ((#[1, 2, 3]) == 3) assume ((#[1, 2, 3]) == 3)
[#$list, size of $list] all compile to "(#\($list as lua expr))" # Length
($list is empty) compiles to "(#\($list as lua expr) == 0)" [#$list, size of $list] all compile to:
lua> ("
local list_lua = \($list as lua expr)
if list_lua:text() == "..." then
return LuaCode("select('#', ...)")
end
return LuaCode("(#", list_lua, ")")
")
($list is empty) parses as ((#$list) == 0)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~