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

Tidying up.

Browse Source
This commit is contained in:
Bruce Hill 2017-09-21 14:13:24 -07:00
parent 4fd6b61a00
commit e478b33d7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/operators.nom
View File

@ -74,12 +74,12 @@ macro [%a != %b] =: ".."|(not compiler.utils.equivalent(\%a as lua\, \%b as lua\
# Commutative Operators defined for up to 8 operands # Commutative Operators defined for up to 8 operands
# TODO: work out solution for commutative operators using more clever macros # TODO: work out solution for commutative operators using more clever macros
lua block ".." lua block ".."
|local function make_comops() |local function make_comops(max_operands)
|local comops = {"+","*","and","or"} |local comops = {"+","*","and","or"}
|for _,_op in ipairs(comops) do |for _,_op in ipairs(comops) do
| local op = _op | local op = _op
| local spec = "%1 "..op.." %2" | local spec = "%1 "..op.." %2"
| for n=3,8 do | for n=3,max_operands do
| spec = spec .." "..op.." %"..tostring(n) | spec = spec .." "..op.." %"..tostring(n)
| compiler:defmacro(spec, (function(compiler, vars, kind) | compiler:defmacro(spec, (function(compiler, vars, kind)
| local bits = {} | local bits = {}
@ -91,9 +91,9 @@ lua block ".."
| end | end
|end |end
|end |end
|make_comops() |make_comops(8)
# Chained compairsions (e.g. x < y <= z < w) are defined up to 3 operands # Chained compairsions (e.g. x < y <= z) are defined up to 3 operands
lua block ".." lua block ".."
|local function chained_comparisons(max_operands) |local function chained_comparisons(max_operands)
|for _,chainers in ipairs({{"<","<="},{">",">="}}) do |for _,chainers in ipairs({{"<","<="},{">",">="}}) do