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

Merge branch 'master' of bitbucket.org:datatransition_/mm2ep_depend

Browse source
This commit is contained in:
Roguelearg 2017-09-12 17:46:38 +02:00
commit 83303ed25f
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -4,7 +4,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
gem 'thor' gem 'thor'
gem 'rly' gem 'rly'
gem 'pry' gem 'pry'
gem 'opal'
# Specify your gem's dependencies in mm2ep_depend.gemspec # Specify your gem's dependencies in mm2ep_depend.gemspec
gemspec gemspec

5
lib/mm2ep_depend/parser.rb
View file

@ -74,7 +74,7 @@ module Mm2ep
end end
def to_s def to_s
"( #{@expr1.to_s}) AND (#{@expr2.to_s} )" "( #{@expr1.to_s} ) AND ( #{@expr2.to_s} )"
end end
end end
@ -89,7 +89,7 @@ module Mm2ep
end end
def to_s def to_s
"( #{@expr1.to_s}) OR (#{@expr2.to_s} )" "( #{@expr1.to_s} ) OR ( #{@expr2.to_s} )"
end end
end end
@ -127,6 +127,7 @@ module Mm2ep
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, :UMINUS precedence :right, :UMINUS
rule 'statement : expr' do |st, e| rule 'statement : expr' do |st, e|