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

Fix precedences

Browse source
This commit is contained in:
Glenn Y. Rolland 2017-09-12 17:09:53 +02:00
parent 62005c6087
commit b89add6adf
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/mm2ep_depend/lexer.rb
View file

@ -2,18 +2,18 @@ module Mm2ep
module Depend
class Lexer < Rly::Lex
token :SPACE, /\s+/
token :L_PAR, /\(/
token :R_PAR, /\)/
token :NUMBER, /[0-9]+(\.[0-9]+)?/
token :STRING, /"[^"]*"/
token :EQ_OP, /\=/
token :T_BOOL, /[tT]rue/
token :F_BOOL, /[fF]alse/
token :T_BOOL, /true/i
token :F_BOOL, /false/i
token :VAR, /[a-z][a-zA-Z0-9_]+/
token :AND_OP, /AND/
token :OR_OP, /OR/
token :NOT_OP, /NOT/
token :SPACE, /\s+/
on_error do |t|
puts "Illegal character #{t.value}"

8
lib/mm2ep_depend/parser.rb
View file

@ -124,8 +124,10 @@ module Mm2ep
class Parser < Rly::Yacc
precedence :left, 'OR_OP', 'EQ_OP'
precedence :left, 'AND_OP', 'NOT_OP'
precedence :left, 'OR_OP'
precedence :left, 'AND_OP'
precedence :left, 'EQ_OP'
precedence :right, :UMINUS
rule 'statement : expr' do |st, e|
st.value = e.value
@ -146,7 +148,7 @@ module Mm2ep
ex.value = BoolValue.new(l.value.to_s)
end
rule 'expr : NOT_OP SPACE expr' do |ex, l, s, e|
rule 'expr : NOT_OP SPACE expr %prec UMINUS' do |ex, l, s, e|
ex.value = NotOp.new(e.value)
end