glenux/namarara
glenux/namarara
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix AND evaluation

Browse source
This commit is contained in:
Glenn Y. Rolland 2017-09-12 17:52:38 +02:00
parent 12b310b7c2
commit e76e11535d
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/mm2ep_depend/parser.rb
View file

@ -124,10 +124,10 @@ module Mm2ep
class Parser < Rly::Yacc class Parser < Rly::Yacc
precedence :left, 'OR_OP' precedence :left, :OR_OP
precedence :left, 'AND_OP' precedence :left, :AND_OP
precedence :left, 'EQ_OP' precedence :left, :EQ_OP
precedence :left, 'L_PAR', 'R_PAR' precedence :right, :L_PAR, :R_PAR
precedence :right, :UMINUS precedence :right, :UMINUS
rule 'statement : expr' do |st, e| rule 'statement : expr' do |st, e|
@ -153,13 +153,14 @@ module Mm2ep
ex.value = NotOp.new(e.value) ex.value = NotOp.new(e.value)
end end
rule 'expr : expr OR_OP expr' do |ex, l, e, r|
ex.value = OrOp.new(l.value, r.value)
end
rule 'expr : expr AND_OP expr' do |ex, l, e, r| rule 'expr : expr AND_OP expr' do |ex, l, e, r|
ex.value = AndOp.new(l.value, r.value) ex.value = AndOp.new(l.value, r.value)
end end
rule 'expr : expr OR_OP expr' do |ex, l, e, r|
ex.value = OrOp.new(l.value, r.value)
end
rule 'expr : L_PAR expr R_PAR' do |ex, l, e, r| rule 'expr : L_PAR expr R_PAR' do |ex, l, e, r|
ex.value = e.value ex.value = e.value
end end