eqn 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66e4ae8e6dc085c3b899b571fce70d14c5cf7b75
-  data.tar.gz: c42d2d4fd3d8f705e8f22b25cee68cf8ef57f472
+  metadata.gz: 08c722b548df16e9f686ca109df362c10592c8a0
+  data.tar.gz: aedb663d5c308aaf018bab79028432e0538883be
 SHA512:
-  metadata.gz: 94d074d217a93397af2d48c0beec74f4b24db070a730100e47fad5c3470449bd441a0294a51f4ee26d7766c4b991b37c95cd0fae6b01a56564729dd51f936c46
-  data.tar.gz: f70fc70d36c8dbf3706c664122d24483a21f8e3c04bd4be5ce1cca39740f359cf1c33c2a989df6e12cfc1a18cfd10d2d3bbcf81d829329c125af9b27a457156e
+  metadata.gz: f8c56e988905d9860e879241e9ce231db2d1ba82a68e38a317d09b575ecc9a53e228288b88e1b0a448ff4bb5cfeac1b4c6bc429e7e4b730d9600f5c564d2a90b
+  data.tar.gz: 24b4da1f8663c8cbb6c12246ecbe82eb78a477ab093370c81a37605492b50a0b783fe13df6ca3a892de65fb016ae2ad56ca4a8eeeeb8b4ccaaee9861582f8a6d

data/README.md

@@ -75,6 +75,10 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 The gem uses rspec for testing; run `rspec` from the application root to execute the tests.
 
+## Authorship
+
+Written by Zach Schneider for [Aha!, the world's #1 product roadmap software](http://www.aha.io/)
+
 ## Contributing
 
 1. Fork it ( https://github.com/schneidmaster/eqn/fork )

data/lib/eqn.treetop

@@ -64,7 +64,11 @@ grammar Eqn
   end
 
   rule signed_float
-    sign? space? digits? decimal? <Eqn::Number::SignedNumber>
+    sign? space? (float / digits) <Eqn::Number::SignedNumber>
+  end
+
+  rule float
+    digits? decimal <Eqn::Number::Float>
   end
 
   rule decimal
@@ -99,6 +103,10 @@ grammar Eqn
     / '!=' <Eqn::Terminal::CompOp::Neq>
   end
 
+  rule dot
+    '.' <Eqn::Terminal::Dot>
+  end
+
   rule exp
     'e' / 'E'
   end

data/lib/eqn/calculator.rb

@@ -3,7 +3,7 @@ module Eqn
     class << self
       def calc(data)
         result = Parser.parse(data).value
-        fail ZeroDivisionError if result.is_a?(Float) && result.abs == Float::INFINITY
+        fail ZeroDivisionError if result.is_a?(Float) && (result.abs == Float::INFINITY || result.nan?)
         result
       end
 

data/lib/eqn/number.rb

@@ -9,27 +9,34 @@ module Eqn
       base
     end
 
-    # rubocop:disable Metrics/AbcSize
     class SignedNumber < Node
       def value
         # Store sign if any.
         sign_negative = elements.shift.negative? if elements.first.is_a? Terminal::Sign
 
-        # Store base number.
-        base = elements.shift.value
-
-        # Handle decimal.
-        base += elements.shift.value unless elements.empty?
+        # Evaluate float.
+        value = elements.shift.value
 
         # Apply sign if any.
         if sign_negative
-          -base
+          -value
         else
-          base
+          value
         end
       end
     end
 
+    class Float < Node
+      def value
+        base = elements.shift.value
+
+        # Add any decimal.
+        base += elements.shift.value unless elements.empty?
+
+        base
+      end
+    end
+
     class Decimal < Node
       def value
         elements.shift.dec_value

data/lib/eqn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Zach Schneider