eqn 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c722b548df16e9f686ca109df362c10592c8a0
-  data.tar.gz: aedb663d5c308aaf018bab79028432e0538883be
+  metadata.gz: c7a78002efee6ad3b972ad83a8e6a465f1315116
+  data.tar.gz: ebbe4de996b80177d20d108940496aa924ae8e18
 SHA512:
-  metadata.gz: f8c56e988905d9860e879241e9ce231db2d1ba82a68e38a317d09b575ecc9a53e228288b88e1b0a448ff4bb5cfeac1b4c6bc429e7e4b730d9600f5c564d2a90b
-  data.tar.gz: 24b4da1f8663c8cbb6c12246ecbe82eb78a477ab093370c81a37605492b50a0b783fe13df6ca3a892de65fb016ae2ad56ca4a8eeeeb8b4ccaaee9861582f8a6d
+  metadata.gz: 45338dbccc37d5d4cfb31f53423af3049063b29b54230a23ef1e0b737b85427b12b9bcadb74e767bcea25950576e3f0c2e02722d659e191093c9f691559a67fe
+  data.tar.gz: 7e311be733a590f3bb895f864afe546c4a95afd17840d6a9d837acd398dce36533bfb000af1cd32cc135b2f51f85db35e3d4b771c9f0dd116edfb1e11b6fbc55

data/.travis.yml

@@ -6,4 +6,5 @@ install:
   - gem install bundler --version '1.8.5'
   - bundle
 script:
-  - bundle exec rspec
+  - bundle exec rspec
+  - bundle exec rubocop

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/schneidmaster/eqn.svg?branch=master)](https://travis-ci.org/schneidmaster/eqn)
+[![Gem Version](https://badge.fury.io/rb/eqn.svg)](http://badge.fury.io/rb/eqn) [![Build Status](https://travis-ci.org/schneidmaster/eqn.svg?branch=master)](https://travis-ci.org/schneidmaster/eqn)
 
 # Eqn
 

data/lib/eqn.treetop

@@ -103,10 +103,6 @@ grammar Eqn
     / '!=' <Eqn::Terminal::CompOp::Neq>
   end
 
-  rule dot
-    '.' <Eqn::Terminal::Dot>
-  end
-
   rule exp
     'e' / 'E'
   end

data/lib/eqn/expression.rb

@@ -2,19 +2,47 @@ module Eqn
   class Node < Treetop::Runtime::SyntaxNode; end
 
   class Expression < Node
+    def left_associative?
+      elements.any? && elements.last.left_associative?
+    end
+
+    def term?
+      elements.empty?
+    end
+
+    # rubocop:disable Metrics/AbcSize
     def value
       if elements.count == 1
         elements.shift.value
       else
         base = elements.shift.value
-        op, num = elements.shift.value
-        base.send(op, num)
+
+        # Aggressively consume left associative operators to maintain associativity.
+        while left_associative?
+          op, num_expr = elements.shift.value
+          num_expr_operand = num_expr.elements.shift
+          base = base.send(op, num_expr_operand.value)
+          elements.push num_expr.elements.shift unless num_expr.term?
+        end
+
+        # Apply next right-associative operator (if any) or return.
+        if term?
+          base
+        else
+          op, num_expr = elements.shift.value
+          base.send(op, num_expr.value)
+        end
       end
     end
+    # rubocop:enable Metrics/AbcSize
 
     class ExprGroup < Node
+      def left_associative?
+        elements.first.left_associative?
+      end
+
       def value
-        [elements.shift.value, elements.shift.value]
+        [elements.shift.value, elements.shift]
       end
     end
   end

data/lib/eqn/terminal.rb

@@ -20,30 +20,50 @@ module Eqn
 
     class Op < Node
       class Add < Node
+        def left_associative?
+          false
+        end
+
         def value
           '+'
         end
       end
 
       class Sub < Node
+        def left_associative?
+          true
+        end
+
         def value
           '-'
         end
       end
 
       class Mul < Node
+        def left_associative?
+          false
+        end
+
         def value
           '*'
         end
       end
 
       class Div < Node
+        def left_associative?
+          true
+        end
+
         def value
           '/'
         end
       end
 
       class Pow < Node
+        def left_associative?
+          false
+        end
+
         def value
           '**'
         end

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop