math_engine 0.6.4 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9e98431e721fc6a9e9e76074de4666dc634b1bc5
+  data.tar.gz: 336c1a08937a4a453589fc728181c5cd55ee5f35
+SHA512:
+  metadata.gz: 328cfd23de9da48f972a5efdc6c3e65007274c592fe9ad4863c358633ffc2ea927d6c54885e0255414b3635cf78ae605d830a518ad6d08fbed573a8d1cbbac18
+  data.tar.gz: af33ab3cc14f3819249c6c579686cc8282a25c3689a81ef8ce2a44056abb5d692611acb5b7f71a506a4c68e14b604b60b837ab5d9008344bc2af7bd1c62d6b4e

data/lib/lexer.rb

@@ -2,26 +2,26 @@ require "lexr"
 class MathEngine
   Lexer = Lexr.that {
     ignores /\s/ => :whitespace
-    
-    legal_place_for_binary_operator = lambda { |prev| [:addition, 
-                                                       :subtraction, 
-                                                       :multiplication, 
+
+    legal_place_for_binary_operator = lambda { |prev| [:addition,
+                                                       :subtraction,
+                                                       :multiplication,
                                                        :division,
                                                        :open_parenthesis,
                                                        :start].include? prev.type }
-    
+
     matches ',' => :comma
     matches '=' => :assignment
-    matches '+' => :addition, :unless => legal_place_for_binary_operator
-    matches '-' => :subtraction, :unless => legal_place_for_binary_operator
-    matches '*' => :multiplication, :unless => legal_place_for_binary_operator
-    matches '/' => :division, :unless => legal_place_for_binary_operator
-    matches '^' => :exponent, :unless => legal_place_for_binary_operator
-    matches '%' => :modulus, :unless => legal_place_for_binary_operator
+    matches '+' => :addition, unless: legal_place_for_binary_operator
+    matches '-' => :subtraction, unless: legal_place_for_binary_operator
+    matches '*' => :multiplication, unless: legal_place_for_binary_operator
+    matches '/' => :division, unless: legal_place_for_binary_operator
+    matches '^' => :exponent, unless: legal_place_for_binary_operator
+    matches '%' => :modulus, unless: legal_place_for_binary_operator
     matches '(' => :open_parenthesis
     matches ')' => :close_parenthesis
-    
-    matches /([-+]?(\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?[r]?|[-+]?((\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?)?[i]|[-+]?(\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?[r]?[-+]((\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?)?[i])/ => :number, :convert_with => lambda { |v| BigDecimal(v) }
-    matches /[a-z][a-z0-9_]*/i => :identifier, :convert_with => lambda { |v| v.to_sym }
+
+    matches /[a-z][a-z0-9_]*/i => :identifier, convert_with: lambda { |v| v.to_sym }
+    matches /([-+]?(\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?[r]?|[-+]?((\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?)?[i]|[-+]?(\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?[r]?[-+]((\d+\.?\d*|\d*\.?\d+)([Ee][-+]?[0-2]?\d{1,2})?)?[i])/ => :number, convert_with: lambda { |v| BigDecimal(v) }
   }
 end

data/lib/parser.rb

@@ -68,7 +68,7 @@ class MathEngine
       end
       result || left
     end
-    
+
     def factor
       if current.type == :number
         result = MathEngine::LiteralNumberNode.new(current.value)
@@ -79,7 +79,7 @@ class MathEngine
         next!
         return result
       end
-    
+
       expect_current :open_parenthesis, "number, variable or open_parenthesis"
       next!
       result = MathEngine::ParenthesisedExpressionNode.new(expression)
@@ -98,7 +98,7 @@ class MathEngine
       expect_current :close_parenthesis
       result
     end
-  
+
     def call_parameter
       left = expression
       right = nil
@@ -112,7 +112,7 @@ class MathEngine
     def current
       @lexer.current
     end
-  
+
     def peek
       @lexer.peek
     end
@@ -125,4 +125,4 @@ class MathEngine
       raise MathEngine::ParseError.new("Unexpected #{current}, expected: #{friendly ? friendly : type}") unless current.type == type
     end
   end
-end
+end

metadata

@@ -1,91 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: math_engine
 version: !ruby/object:Gem::Version
-  version: 0.6.4
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Baldry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2017-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lexr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Lightweight matematical expression parser that is easy to extend
-email: michael@brightbits.co.uk
+email: mikeyb@buyapowa.com
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
 - README.md
-- lib/nodes.rb
-- lib/lexer.rb
 - lib/context.rb
 - lib/errors.rb
-- lib/math_engine.rb
-- lib/evaluators/finders.rb
 - lib/evaluators/calculate.rb
+- lib/evaluators/finders.rb
+- lib/lexer.rb
+- lib/math_engine.rb
+- lib/nodes.rb
 - lib/parser.rb
-homepage: http://www.brightbits.co.uk
+homepage: http://tech.buyapowa.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1839538838728425454
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lightweight mathematical expression parser
 test_files: []