math_expr 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e909048f6c47274b8c4661b73c856118ee04bb3790ac4f15f8d5d154e5493888
-  data.tar.gz: d54004a17b72df3dbe951d396d2d476f6fa6e4be153f8d69298ab16187fbec39
+  metadata.gz: 106eec5ec34e60824dc64b24d8a3724594e23306c38590f54dd4910c77471403
+  data.tar.gz: f7454b2fec6dc03cc21360393fdc4ca5aea4b5eab0c0a583da6707bf886162d0
 SHA512:
-  metadata.gz: 6952fb7b5010b46c42982bfe305199bc8c1307e2368d995d697e47c46caa2a409c3a06e052cd6f04a2e54c8014dbbcf295462735ab5353e6774681bfef61196e
-  data.tar.gz: df65283ffd5cbd3d8d13ecaf58ac25e8026573420bb95952354467d17afc644c83cab59a71175a87b3841ec63f6593ec1cf203c4a8b40fa4cb08364ad08e5308
+  metadata.gz: 7b078aa5ab40eef674aa1a93e7d9d1088fcaba1a92d7650f561b0094fb30889df2ca3be260c0eb3ce2b4dc8268f0e60f0b9de24791daf10bc1dc98514ff20ebe
+  data.tar.gz: 9fd738aeccda623343ba4467dce8d17e501e0a304447a0ce5751c01235db9c83e945e365dbb494be2c8bddd8b749a302d806bc7a0a2b2f0f27bf36e5f7a182fb

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/README.md

@@ -1,15 +1,13 @@
 # MathExpression
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/math_expression`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Parses a mathematical expression from infix notation into reverse polish notation and produces a result.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'math_expression'
+gem 'math_expr'
 ```
 
 And then execute:
@@ -18,11 +16,21 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install math_expression
+    $ gem install math_expr
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+require 'math_expression/parser'
+
+parser = MathExpression::Parser.new('4 + 5')
+
+parser.to_tokens # => [{:type=>:number, :value=>4}, {:type=>:operator, :value=>"+"}, {:type=>:number, :value=>5}]
+
+parser.to_postfix # => [4, 5, "+"]
+
+parser.evaluate # => 9
+```
 
 ## Development
 

data/lib/math_expression/parser.rb

@@ -11,15 +11,20 @@ class MathExpression::Parser
 
     form_number = lambda do
       return if reading_number.empty?
-      num = reading_number.join.to_i
+      num = reading_number.join.to_f
       tokens << { type: :number, value: num }
       reading_number = []
     end
 
-    expression.chars.each do |character|
+    printable_chars = expression.chars.reject { |c| c == ' ' }
+
+    printable_chars.each do |character|
       if operator?(character)
         form_number.call
-        tokens << { type: :operator, value: character}
+        tokens << { type: :operator, value: character }
+      elsif parenthesis?(character)
+        form_number.call
+        tokens << { type: :parenthesis, value: character }
       else
         reading_number << character
       end
@@ -33,19 +38,33 @@ class MathExpression::Parser
     operator_stack = []
 
     to_tokens.each do |token|
-      case token[:type]
+      type, value = token[:type], token[:value]
+
+      case type
       when :number
-        output_queue << token[:value]
+        output_queue << value
       when :operator
         loop do
           break if operator_stack.empty?
+          break if left_parenthesis?(operator_stack.last)
           operator_on_stack_precedence = operator_precedence(operator_stack.last)
-          current_operator_precedence = operator_precedence(token[:value])
-          break if operator_on_stack_precedence < current_operator_precedence
+          current_operator_precedence = operator_precedence(value)
+          break if operator_on_stack_precedence <= current_operator_precedence
 
           output_queue << operator_stack.pop
         end
-        operator_stack.push(token[:value])
+        operator_stack.push(value)
+      when :parenthesis
+        if left_parenthesis?(value)
+          operator_stack.push(value)
+        else
+          while !left_parenthesis?(operator_stack.last)
+            output_queue << operator_stack.pop
+          end
+          if left_parenthesis?(operator_stack.last)
+            operator_stack.pop
+          end
+        end
       end
     end
     (output_queue + operator_stack.reverse)
@@ -63,9 +82,10 @@ class MathExpression::Parser
       when '*'
         stack.pop * stack.pop
       when '/'
-        stack.pop / stack.pop
+        first, second = stack.pop, stack.pop
+        second / first
       else
-        token.to_i
+        token.to_f
       end
       stack.push(result)
     end
@@ -74,19 +94,31 @@ class MathExpression::Parser
 
   private
 
-  OPERATORS = %w(+ - * /).freeze
+  OPERATORS = {
+    '+' => 2,
+    '-' => 2,
+    '*' => 3,
+    '/' => 3,
+  }.freeze
 
   def operator?(token)
-    OPERATORS.include?(token)
+    OPERATORS.keys.include?(token)
   end
 
   def operator_precedence(operator)
-    {
-      '+' => 2,
-      '-' => 2,
-      '*' => 3,
-      '/' => 3,
-    }.fetch(operator)
+    OPERATORS.fetch(operator)
+  end
+
+  def parenthesis?(token)
+    left_parenthesis?(token) || right_parenthesis?(token)
+  end
+
+  def left_parenthesis?(token)
+    token == '('
+  end
+
+  def right_parenthesis?(token)
+    token == ')'
   end
 
   attr_reader :expression

data/lib/math_expression/version.rb

@@ -1,3 +1,3 @@
 module MathExpression
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: math_expr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Inclooder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec