eqn 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72aa39e625ff099ac7869c8674ebfee16778bf68
-  data.tar.gz: 12ab353c122b7d5666460817f1aa27ee70cf9ac5
+  metadata.gz: 66e4ae8e6dc085c3b899b571fce70d14c5cf7b75
+  data.tar.gz: c42d2d4fd3d8f705e8f22b25cee68cf8ef57f472
 SHA512:
-  metadata.gz: f21e1917137c223fa4d35a3ead85aa4f36d11729d4e844702953461d6b5dffff83eb361bf4d5046e73e2a93191385af959ccedfd4f496bceb14a740f6251cd23
-  data.tar.gz: 986aa3bee41487e0e451049225482424236a20549a5d315d049cbdfc20db7b211d635fb78e9087de44293ade39ca30ac363c81123a0994c187c67f7097c1a2a6
+  metadata.gz: 94d074d217a93397af2d48c0beec74f4b24db070a730100e47fad5c3470449bd441a0294a51f4ee26d7766c4b991b37c95cd0fae6b01a56564729dd51f936c46
+  data.tar.gz: f70fc70d36c8dbf3706c664122d24483a21f8e3c04bd4be5ce1cca39740f359cf1c33c2a989df6e12cfc1a18cfd10d2d3bbcf81d829329c125af9b27a457156e

data/lib/eqn.treetop

@@ -8,7 +8,7 @@ grammar Eqn
   end
 
   rule expression
-    multitive addsub_group? <Eqn::Expression>
+    space? multitive space? addsub_group? space? <Eqn::Expression>
   end
 
   rule addsub_group
@@ -16,19 +16,19 @@ grammar Eqn
   end
 
   rule multitive
-    exponentiative muldiv_group? <Eqn::Expression>
+    exponentiative space? muldiv_group? <Eqn::Expression>
   end
 
   rule muldiv_group
-    muldiv_op multitive <Eqn::Expression::ExprGroup>
+    muldiv_op space? multitive <Eqn::Expression::ExprGroup>
   end
 
   rule exponentiative
-    operand pow_group? <Eqn::Expression>
+    operand space? pow_group? <Eqn::Expression>
   end
 
   rule pow_group
-    pow_op exponentiative <Eqn::Expression::ExprGroup>
+    pow_op space? exponentiative <Eqn::Expression::ExprGroup>
   end
 
   rule operand
@@ -40,19 +40,19 @@ grammar Eqn
   end
 
   rule if_func
-    'if' '(' comparation ',' expression ',' expression ')' <Eqn::Function::If>
+    'if' space? '(' comparation ',' expression ',' expression ')' <Eqn::Function::If>
   end
 
   rule round_func
-    'round' group <Eqn::Function::Round>
+    'round' space? group <Eqn::Function::Round>
   end
 
   rule roundup_func
-    'roundup' group <Eqn::Function::RoundUp>
+    'roundup' space? group <Eqn::Function::RoundUp>
   end
 
   rule rounddown_func
-    'rounddown' group <Eqn::Function::RoundDown>
+    'rounddown' space? group <Eqn::Function::RoundDown>
   end
 
   rule group
@@ -60,11 +60,11 @@ grammar Eqn
   end
 
   rule number
-    signed_float exponent? <Eqn::Number>
+    signed_float space? exponent? <Eqn::Number>
   end
 
   rule signed_float
-    sign? digits? decimal? <Eqn::Number::SignedNumber>
+    sign? space? digits? decimal? <Eqn::Number::SignedNumber>
   end
 
   rule decimal
@@ -72,7 +72,7 @@ grammar Eqn
   end
 
   rule exponent
-    exp signed_float <Eqn::Number::Exponent>
+    exp space? signed_float <Eqn::Number::Exponent>
   end
 
   rule pow_op
@@ -110,4 +110,8 @@ grammar Eqn
   rule digits
     [0-9]+ <Eqn::Terminal::Digits>
   end
+
+  rule space
+    ("\s" / "\t")*
+  end
 end

data/lib/eqn/calculator.rb

@@ -10,7 +10,7 @@ module Eqn
       def valid?(data)
         calc(data)
         true
-      rescue Exception
+      rescue ParseError, ZeroDivisionError
         false
       end
     end

data/lib/eqn/number.rb

@@ -9,6 +9,7 @@ module Eqn
       base
     end
 
+    # rubocop:disable Metrics/AbcSize
     class SignedNumber < Node
       def value
         # Store sign if any.

data/lib/eqn/parse_error.rb

@@ -0,0 +1 @@
+class ParseError < StandardError; end

data/lib/eqn/parser.rb

@@ -2,32 +2,23 @@ require 'eqn/function'
 require 'eqn/comparation'
 require 'eqn/expression'
 require 'eqn/number'
+require 'eqn/parse_error'
 require 'eqn/terminal'
 
 module Eqn
-  WHITESPACE_REGEX = /([^0-9]( )+[^0-9|.])|([^0-9]( )+[0-9|.])|([0-9]( )+[^0-9|.])/
-
   class Parser
     # Load the Treetop grammar from the grammar.
     Treetop.load(File.join(File.dirname(__dir__), 'eqn.treetop'))
     @@parser = EqnParser.new
 
     def self.parse(data)
-      # Remove any whitespace and pass the data over to the parser instance.
-      data.downcase!
-      while data =~ Eqn::WHITESPACE_REGEX
-        data = data.downcase.gsub(Eqn::WHITESPACE_REGEX) do
-          Regexp.last_match.to_s.delete(' ')
-        end
-      end
-      tree = @@parser.parse(data)
+      # Pass the data over to the parser instance.
+      tree = @@parser.parse(data.downcase)
 
       # Raise any errors.
-      if tree.nil?
-        fail Exception, "Parse error at offset: #{@@parser.index}" + @@parser.failure_reason
-      end
+      fail ParseError, "Parse error at offset: #{@@parser.index}" + @@parser.failure_reason if tree.nil?
 
-      # Remove extraneous nodes and return the tree.
+      # Remove extraneous nodes and return tree.
       clean_tree(tree)
     end
 

data/lib/eqn/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eqn
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Zach Schneider
@@ -106,6 +106,7 @@ files:
 - lib/eqn/expression.rb
 - lib/eqn/function.rb
 - lib/eqn/number.rb
+- lib/eqn/parse_error.rb
 - lib/eqn/parser.rb
 - lib/eqn/terminal.rb
 - lib/eqn/version.rb