rgviz 0.29 → 0.30

data/lib/rgviz/parser.rb

@@ -192,21 +192,25 @@ module Rgviz
     
     def parse_or_expression
       left = parse_and_expression
-      if token_is! Token::Or
-        right = parse_and_expression
-        BinaryExpression.new left, BinaryExpression::Or, right
-      else
-        left
+      while true
+        if token_is! Token::Or
+          right = parse_and_expression
+          left = BinaryExpression.new left, BinaryExpression::Or, right
+        else
+          return left
+        end
       end
     end
     
     def parse_and_expression
       left = parse_not_expression
-      if token_is! Token::And
-        right = parse_not_expression
-        BinaryExpression.new left, BinaryExpression::And, right
-      else
-        left
+      while true
+        if token_is! Token::And
+          right = parse_not_expression
+          left = BinaryExpression.new left, BinaryExpression::And, right
+        else
+          return left
+        end
       end
     end
     
@@ -281,34 +285,38 @@ module Rgviz
     end
     
     def parse_summation_or_substraction
-      column1 = parse_multiplication_or_divition
-      case @token.value
-      when Token::PLUS
-        next_token
-        column2 = parse_multiplication_or_divition
-        ScalarFunctionColumn.new ScalarFunctionColumn::Sum, column1, column2
-      when Token::MINUS
-        next_token
-        column2 = parse_multiplication_or_divition
-        ScalarFunctionColumn.new ScalarFunctionColumn::Difference, column1, column2
-      else
-        column1
+      left = parse_multiplication_or_divition
+      while true
+        case @token.value
+        when Token::PLUS
+          next_token
+          right = parse_multiplication_or_divition
+          left = ScalarFunctionColumn.new ScalarFunctionColumn::Sum, left, right
+        when Token::MINUS
+          next_token
+          right = parse_multiplication_or_divition
+          left = ScalarFunctionColumn.new ScalarFunctionColumn::Difference, left, right
+        else
+          return left
+        end
       end
     end
     
     def parse_multiplication_or_divition
-      column1 = parse_atomic_column
-      case @token.value
-      when Token::STAR
-        next_token
-        column2 = parse_atomic_column
-        ScalarFunctionColumn.new ScalarFunctionColumn::Product, column1, column2
-      when Token::SLASH
-        next_token
-        column2 = parse_atomic_column
-        ScalarFunctionColumn.new ScalarFunctionColumn::Quotient, column1, column2
-      else
-        column1
+      left = parse_atomic_column
+      while true
+        case @token.value
+        when Token::STAR
+          next_token
+          right = parse_atomic_column
+          left = ScalarFunctionColumn.new ScalarFunctionColumn::Product, left, right
+        when Token::SLASH
+          next_token
+          right = parse_atomic_column
+          left = ScalarFunctionColumn.new ScalarFunctionColumn::Quotient, left, right
+        else
+          return left
+        end
       end
     end
     

data/spec/rgviz/parser_spec.rb

@@ -331,6 +331,20 @@ describe Parser do
     options.no_format.should be_true
   end
   
+  it "parses where with two ands" do
+    parse "where 1 = 1 and 1 = 1 and 1 = 1"
+  end
+  
+  it "parses where with two ors" do
+    parse "where 1 = 1 or 1 = 1 or 1 = 1"
+  end
+  
+  ['+', '-', '*', '/'].each do |op|
+    it "parses where with two #{op}" do
+      parse "where 1 #{op} 2 #{op} 3 = 4"
+    end
+  end
+  
   it_raises_on 'select'
   it_raises_on 'where'
   it_raises_on 'where 1'

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: false
   segments: 
   - 0
-  - 29
-  version: "0.29"
+  - 30
+  version: "0.30"
 platform: ruby
 authors: 
 - Ary Borenszweig