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

More cleanup of vars.XX -> \%XX

Browse Source
This commit is contained in:
Bruce Hill 2018-01-05 15:45:46 -08:00
parent 139bd76efc
commit 2df539a762
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/control_flow.nom
View File

@ -169,7 +169,7 @@ compile [when %body] to code:
Invalid format for 'when' statement. Only '*' blocks are allowed. Invalid format for 'when' statement. Only '*' blocks are allowed.
%tokens = (%func_call's "value") %tokens = (%func_call's "value")
%star = (%tokens -> 1) %star = (%tokens -> 1)
assert (=lua "vars.star and vars.star.type == 'Word' and vars.star.value == '*'") ".." assert (=lua "\%star and \%star.type == 'Word' and \%star.value == '*'") ".."
Invalid format for 'when' statement. Lines must begin with '*' Invalid format for 'when' statement. Lines must begin with '*'
%condition = (%tokens -> 2) %condition = (%tokens -> 2)
@ -178,10 +178,10 @@ compile [when %body] to code:
%action = (%tokens -> 3) %action = (%tokens -> 3)
if (%action == (nil)): if (%action == (nil)):
lua do> "table.insert(vars.fallthroughs, vars.condition)" lua do> "table.insert(\%fallthroughs, \%condition)"
do next %func_call do next %func_call
if (=lua "vars.condition.type == 'Word' and vars.condition.value == 'else'"): if (=lua "\%condition.type == 'Word' and \%condition.value == 'else'"):
%result join= ".." %result join= ".."
else else
@ -213,7 +213,7 @@ compile [when %branch_value == ? %body] to code:
Invalid format for 'when' statement. Only '*' blocks are allowed. Invalid format for 'when' statement. Only '*' blocks are allowed.
%tokens = (%func_call's "value") %tokens = (%func_call's "value")
%star = (%tokens -> 1) %star = (%tokens -> 1)
assert (=lua "vars.star and vars.star.type == 'Word' and vars.star.value == '*'") ".." assert (=lua "\%star and \%star.type == 'Word' and \%star.value == '*'") ".."
Invalid format for 'when' statement. Lines must begin with '*' Invalid format for 'when' statement. Lines must begin with '*'
%condition = (%tokens -> 2) %condition = (%tokens -> 2)
@ -222,10 +222,10 @@ compile [when %branch_value == ? %body] to code:
%action = (%tokens -> 3) %action = (%tokens -> 3)
if (%action == (nil)): if (%action == (nil)):
lua> "table.insert(vars.fallthroughs, vars.condition)" lua> "table.insert(\%fallthroughs, \%condition)"
do next %func_call do next %func_call
if (=lua "vars.condition.type == 'Word' and vars.condition.value == 'else'"): if (=lua "\%condition.type == 'Word' and \%condition.value == 'else'"):
%result join= ".." %result join= ".."
else else

4
lib/operators.nom
View File

@ -62,7 +62,7 @@ lua do> ".."
nomsu_alias, op = unpack(op); nomsu_alias, op = unpack(op);
end end
nomsu:defmacro("%a "..nomsu_alias.." %b", (function(nomsu, vars) nomsu:defmacro("%a "..nomsu_alias.." %b", (function(nomsu, vars)
return "("..nomsu:tree_to_lua(vars.a).." "..op.." "..nomsu:tree_to_lua(vars.b)..")"; return "("..nomsu:tree_to_lua(\%a).." "..op.." "..nomsu:tree_to_lua(\%b)..")";
end), [["(\\%a ]]..op..[[ \\%b)"]]); end), [["(\\%a ]]..op..[[ \\%b)"]]);
end end
@ -112,7 +112,7 @@ lua do> ".."
-- Chained comparisons need to be functions to avoid re-evaluating their arguments : -- Chained comparisons need to be functions to avoid re-evaluating their arguments :
nomsu:def(spec, function(nomsu, vars) nomsu:def(spec, function(nomsu, vars)
for i,op in ipairs(chain) do for i,op in ipairs(chain) do
local a, b, result = vars[i], vars[i+1]; local a, b, result = vars[tostring(i)], vars[tostring(i+1)];
if op == "<" then; result = a < b; if op == "<" then; result = a < b;
elseif op == "<=" then; result = a <= b; elseif op == "<=" then; result = a <= b;
elseif op == ">" then; result = a > b; elseif op == ">" then; result = a > b;

4
lib/utils.nom
View File

@ -16,8 +16,8 @@ parse [assert %condition] as: assert %condition (nil)
rule [join %strs with glue %glue] =: rule [join %strs with glue %glue] =:
lua do> ".." lua do> ".."
local str_bits = {} local str_bits = {}
for i,bit in ipairs(vars.strs) do str_bits[i] = nomsu:stringify(bit) end for i,bit in ipairs(\%strs) do str_bits[i] = nomsu:stringify(bit) end
return table.concat(str_bits, vars.glue) return table.concat(str_bits, \%glue)
parse [join %strs] as: join %strs with glue "" parse [join %strs] as: join %strs with glue ""
compile [capitalize %str, %str capitalized] to: compile [capitalize %str, %str capitalized] to:

2
lib/utils2.nom
View File

@ -24,7 +24,7 @@ compile [with %assignments %action] to code:
%tokens = (%assignment's "value") %tokens = (%assignment's "value")
%var = (%tokens -> 1) %var = (%tokens -> 1)
%eq = (%tokens -> 2) %eq = (%tokens -> 2)
assert (=lua "vars.eq and vars.eq.type == 'Word' and vars.eq.value == '='") ".." assert (=lua "\%eq and \%eq.type == 'Word' and \%eq.value == '='") ".."
Invalid format for 'with' statement. List entries must have the form %var = (value) Invalid format for 'with' statement. List entries must have the form %var = (value)
%value = (%tokens -> 3) %value = (%tokens -> 3)
add {i=%i, var=%var, value=%value} to %data add {i=%i, var=%var, value=%value} to %data