eqn 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3929425e71b09257fcf386a38166a5fcf2adc7e5
-  data.tar.gz: 2d47d23b59c716ca5adb87cfdaaa206d3aa5b17f
+  metadata.gz: 4c54bb4df4dbcf3350edbaa0c13994c8372cea5c
+  data.tar.gz: bde508e34f9491145d4c5b7968602a8dd220d5a2
 SHA512:
-  metadata.gz: 3c74b42add0068a547fa8b547fdb4c7a342067747bde79791e89996816205c2ff1655ca60a53c184f38d6b04cb78b4229a4f079ef8d8c4457a26a8285833fade
-  data.tar.gz: da9ae663707fa4b07c41b60b5b87c9c3d82ed8ce530a98d7c87008afd4b81ccaa3974be56ff30c014540717424ab899a8cf45a91a4b3d1c6b27ef31515a209a1
+  metadata.gz: d3f356c8c7eb30b335c972085eaf70e23b30b2611cb46d0857dfad95b4fca6f3a9e8426f9fab50c22b546ca0533335a0421fb0ad358c0e44f3ff2f355367bbf5
+  data.tar.gz: 466d2723c70a6933469d1a3bbfa91affeb64e487edff0aa11525503af7b8c163359ca806b2b5584a4dc6be9c3f355c38fb49c04bdc7b13e3cc5699ae1c290a13

data/eqn.gemspec

@@ -4,7 +4,7 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'eqn/version'
 
-config_files = %w(.rspec .rubocop.yml .ruby-version Appraisals circle.yml)
+config_files = %w[.rspec .rubocop.yml .ruby-version Appraisals circle.yml]
 
 Gem::Specification.new do |spec|
   spec.name          = 'eqn'

data/lib/eqn/calculator.rb

@@ -14,7 +14,7 @@ module Eqn
     end
 
     def method_missing(method, *args)
-      if %i(calculate calc valid?).include?(method)
+      if %i[calculate calc valid?].include?(method)
         self.class.send(method, @eqn, @vars)
       elsif (match = method.to_s.match(/^[A-Za-z]+=$/))
         @vars[match.to_s.delete('=').intern] = args.first
@@ -26,19 +26,14 @@ module Eqn
     end
 
     def respond_to_missing?(method)
-      %i(calculate calc valid?).include?(method) || method.to_s.match(/^[A-Za-z]+=$/) || (var = method.to_s.match(/^[A-Za-z]+$/).to_s.intern) && @vars.key?(var)
+      %i[calculate calc valid?].include?(method) || method.to_s.match(/^[A-Za-z]+=$/) || (var = method.to_s.match(/^[A-Za-z]+$/).to_s.intern) && @vars.key?(var)
     end
 
     class << self
       def calculate(data, vars = {})
-        @@vars = vars
-        begin
-          result = Parser.parse(data).value
-          raise ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
-          result
-        ensure
-          @@vars = nil
-        end
+        result = Parser.parse(data).value(vars)
+        raise ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
+        result
       end
       alias calc calculate
 

data/lib/eqn/comparation.rb

@@ -1,17 +1,17 @@
 module Eqn
   class Comparation < Treetop::Runtime::SyntaxNode
-    def value
-      val_one = elements.shift.value
+    def value(vars = {})
+      val_one = elements.shift.value(vars)
       if elements.empty?
         val_one
       else
-        val_one.send(*elements.shift.value)
+        val_one.send(*elements.shift.value(vars))
       end
     end
 
     class CompGroup < Treetop::Runtime::SyntaxNode
-      def value
-        [elements.shift.value, elements.shift.value]
+      def value(vars = {})
+        [elements.shift.value(vars), elements.shift.value(vars)]
       end
     end
   end

data/lib/eqn/expression.rb

@@ -8,17 +8,17 @@ module Eqn
       elements.empty?
     end
 
-    def value
+    def value(vars = {})
       if elements.count == 1
-        elements.shift.value
+        elements.shift.value(vars)
       else
-        base = elements.shift.value
+        base = elements.shift.value(vars)
 
         # Aggressively consume left associative operators to maintain associativity.
         while left_associative?
-          op, num_expr = elements.shift.value
+          op, num_expr = elements.shift.value(vars)
           num_expr_operand = num_expr.elements.shift
-          base = base.send(op, num_expr_operand.value)
+          base = base.send(op, num_expr_operand.value(vars))
           elements.push num_expr.elements.shift unless num_expr.term?
         end
 
@@ -26,8 +26,8 @@ module Eqn
         if term?
           base
         else
-          op, num_expr = elements.shift.value
-          base.send(op, num_expr.value)
+          op, num_expr = elements.shift.value(vars)
+          base.send(op, num_expr.value(vars))
         end
       end
     end
@@ -37,8 +37,8 @@ module Eqn
         elements.first.left_associative?
       end
 
-      def value
-        [elements.shift.value, elements.shift]
+      def value(vars = {})
+        [elements.shift.value(vars), elements.shift]
       end
     end
   end

data/lib/eqn/function.rb

@@ -1,43 +1,43 @@
 module Eqn
   module Function
     class If < Treetop::Runtime::SyntaxNode
-      def value
-        comp_val = elements.shift.value
-        ls = elements.shift.value
-        rs = elements.shift.value
+      def value(vars = {})
+        comp_val = elements.shift.value(vars)
+        ls = elements.shift.value(vars)
+        rs = elements.shift.value(vars)
 
         comp_val ? ls : rs
       end
     end
 
     class RoundBase < Treetop::Runtime::SyntaxNode
-      def value(fn)
-        value = elements.shift.value
+      def value(fn, vars)
+        value = elements.shift.value(vars)
         raise ZeroDivisionError if value.is_a?(Float) && (value.abs == Float::INFINITY || value.nan?)
         if elements.empty?
           value.send(fn)
         else
-          decimals = elements.shift.value
+          decimals = elements.shift.value(vars)
           (value * 10**decimals).send(fn).to_f / 10**decimals
         end
       end
     end
 
     class Round < RoundBase
-      def value
-        super(:round)
+      def value(vars = {})
+        super(:round, vars)
       end
     end
 
     class RoundUp < RoundBase
-      def value
-        super(:ceil)
+      def value(vars = {})
+        super(:ceil, vars)
       end
     end
 
     class RoundDown < RoundBase
-      def value
-        super(:floor)
+      def value(vars = {})
+        super(:floor, vars)
       end
     end
   end

data/lib/eqn/number.rb

@@ -1,19 +1,19 @@
 module Eqn
   class Number < Treetop::Runtime::SyntaxNode
-    def value
-      base = elements.shift.value
+    def value(vars = {})
+      base = elements.shift.value(vars)
       # Apply any exponent.
-      base *= elements.shift.value unless elements.empty?
+      base *= elements.shift.value(vars) unless elements.empty?
       base
     end
 
     class SignedNumber < Treetop::Runtime::SyntaxNode
-      def value
+      def value(vars = {})
         # Store sign if any.
         sign_negative = elements.shift.negative? if elements.first.is_a? Terminal::Sign
 
         # Evaluate float.
-        value = elements.shift.value
+        value = elements.shift.value(vars)
 
         # Apply sign if any.
         sign_negative ? -value : value
@@ -21,25 +21,25 @@ module Eqn
     end
 
     class Float < Treetop::Runtime::SyntaxNode
-      def value
-        base = elements.shift.value
+      def value(vars = {})
+        base = elements.shift.value(vars)
 
         # Add any decimal.
-        base += elements.shift.value unless elements.empty?
+        base += elements.shift.value(vars) unless elements.empty?
 
         base
       end
     end
 
     class Decimal < Treetop::Runtime::SyntaxNode
-      def value
+      def value(_vars = {})
         elements.shift.dec_value
       end
     end
 
     class Exponent < Treetop::Runtime::SyntaxNode
-      def value
-        10**elements.shift.value
+      def value(vars = {})
+        10**elements.shift.value(vars)
       end
     end
   end

data/lib/eqn/terminal.rb

@@ -1,8 +1,8 @@
 module Eqn
   module Terminal
     class Variable < Treetop::Runtime::SyntaxNode
-      def value
-        val = Eqn::Calculator.class_variable_get(:@@vars)[text_value.intern]
+      def value(vars = {})
+        val = vars[text_value.intern]
         raise NoVariableValueError, "No value given for: #{text_value}" unless val
         raise NonNumericVariableError, "Variable #{text_value} value is nonnumeric: #{val}" unless val.is_a? Numeric
         val
@@ -14,7 +14,7 @@ module Eqn
         ".#{text_value}".to_f
       end
 
-      def value
+      def value(_vars = {})
         text_value.to_f
       end
     end
@@ -30,7 +30,7 @@ module Eqn
         is_a? LeftAssociativeOp
       end
 
-      def value
+      def value(_vars = {})
         text_value == '^' ? :** : text_value.intern
       end
 
@@ -39,7 +39,7 @@ module Eqn
     end
 
     class CompOp < Treetop::Runtime::SyntaxNode
-      def value
+      def value(_vars = {})
         text_value == '=' ? :== : text_value.intern
       end
     end

data/lib/eqn/version.rb

@@ -1,3 +1,3 @@
 module Eqn
-  VERSION = '1.5.0'.freeze
+  VERSION = '1.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop