math_engine 0.1.2 → 0.1.3

data/README.md

@@ -1,6 +1,6 @@
 # MathEngine
 
-MathEngine is a lightweight mathematical expression parser and evaluator. It currently handles addition, subtraction, multiplication and division, but support is planned for other operators and variables, etc.
+MathEngine is a lightweight mathematical expression parser and evaluator. It currently handles addition, subtraction, multiplication, division and the use of variables. 
 
 Install with
 
@@ -11,14 +11,18 @@ Install with
 	require 'rubygems'
 	require 'math_engine'
 
-	puts "#{MathEngine.new.evaluate("10 * (3 * 2) + (55 - 5) / (2.5 * (3 + 1))")}"
+	engine = MathEngine.new
+
+	puts "#{engine.evaluate("x = 10 * (3 * 2) + (55 - 5) / (2.5 * (3 + 1))")}"
+	puts "#{engine.evaluate("x + 5")}"
 
 results in an output of
 
 	65.0
+	70.0
 	
 if you missed a closing parenthesis, had an operator where it wasn't meant to be, you might get something like this:
 
-	Unexpected multiplication(*), expected: number or open_parenthesis
+	Unexpected multiplication(*), expected: number, variable name or open_parenthesis
 	
 and that is pretty much every feature so far. Please let me know of any bugs or additions that you'd like to see!

data/lib/math_engine.rb

@@ -5,7 +5,34 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'math_lexer'))
 require File.expand_path(File.join(File.dirname(__FILE__), 'math_parser'))
 
 class MathEngine
+  def initialize
+    @variables = {}
+  end
+  
   def evaluate(expression)
-    MathParser.new(MathLexer.new(expression)).parse.evaluate
+    MathParser.new(MathLexer.new(expression)).parse.evaluate(self)
+  end
+  
+  def set(variable_name, value)
+    @variables[variable_name] = value
+  end
+  
+  def get(variable_name)
+    raise UnknownVariableError.new(variable_name) unless @variables.keys.include? variable_name
+    @variables[variable_name]
+  end
+  
+  def variables
+    @variables.keys
+  end
+  
+  class UnknownVariableError < StandardError
+    def initialize(variable_name)
+      @variable_name = variable_name
+    end
+    
+    def to_s
+      "Variable '#{@variable_name}' was referenced but does not exist"
+    end
   end
 end

data/lib/math_lexer.rb

@@ -1,6 +1,8 @@
 MathLexer = Lexr.that {
 	ignores /\s/ => :whitespace
+	matches /[a-z][a-z0-9]*/ => :identifier, :convert_with => lambda { |v| v.to_sym }
 	matches /[-+]?[0-9]*\.?[0-9]+/ => :number, :convert_with => lambda { |v| Float(v) }
+	matches '=' => :assignment
 	matches '+' => :addition
 	matches '-' => :subtraction
 	matches '*' => :multiplication

data/lib/math_parser.rb

@@ -4,10 +4,10 @@ class MathParser
 	end
 	
 	def parse
-		#statement = expression <end>
+		#statement = { <identifier> <assignment> } expression <end>
 		#expression = term { ( <addition> | <subtraction> ) term } 
 		#term = factor { ( <multiplication> | <division> ) factor }
-		#factor = <number> | <open_parenthesis> expression <close_parenthesis>
+		#factor = <identifier> | <number> | <open_parenthesis> expression <close_parenthesis>
 		statement
 	end
 	
@@ -15,7 +15,15 @@ class MathParser
 	
 	def statement
 	  next!
-		result = expression
+	  if current.type == :identifier && peek.type == :assignment
+	    variable_name = current.value
+	    next!
+	    expect_current :assignment
+	    next!
+	    result = AssignmentNode.new(IdentifierNode.new(variable_name), expression)
+	  else 
+		  result = expression
+		end
 		next!
 		expect_current :end
 		result
@@ -44,12 +52,14 @@ class MathParser
 	end
 	
 	def factor
-		if current.type == :number
-		  result = LiteralNumberNode.new(current.value)
-		  next!
-		  return result
-	  end
-		expect_current :open_parenthesis, "number or open_parenthesis"
+	  if [:number, :identifier].include? current.type
+	    node_type = current.type == :number ? LiteralNumberNode : IdentifierNode
+	    result = node_type.new(current.value)
+	    next!
+	    return result
+    end
+    
+		expect_current :open_parenthesis, "number, variable or open_parenthesis"
 		next!
 		result = expression
 		expect_current :close_parenthesis
@@ -62,6 +72,10 @@ class MathParser
 	def current
 	  @lexer.current
   end
+  
+  def peek
+    @lexer.peek
+  end
 	
 	def next!
 		@lexer.next
@@ -79,42 +93,56 @@ class MathParser
 				@left, @right = left, right
 			end
 
-			def evaluate
+			def evaluate(engine)
 				raise "Evaluate not overridden in #{self.class.name}"
 			end
 		end
 
 		class LiteralNumberNode < Node
-			def evaluate
+			def evaluate(engine)
 				value
 			end
 		end
 
 		class ExpressionNode < Node
-			def evaluate
-				left.evaluate
+			def evaluate(engine)
+				left.evaluate(engine)
+			end
+		end
+		
+		class IdentifierNode < Node
+		  def evaluate(engine)
+		    engine.get value
+	    end
+	  end
+
+		class AssignmentNode < Node
+			def evaluate(engine)
+				result = right.evaluate(engine)
+				engine.set(left.value, result)
+				result
 			end
 		end
 
 		class AdditionNode < Node
-			def evaluate
-				left.evaluate + right.evaluate
+			def evaluate(engine)
+				left.evaluate(engine) + right.evaluate(engine)
 			end
 		end
 
 		class SubtractionNode < Node
-			def evaluate
-				left.evaluate - right.evaluate
+			def evaluate(engine)
+				left.evaluate(engine) - right.evaluate(engine)
 			end
 		end
 		class MultiplicationNode < Node
-			def evaluate
-				left.evaluate * right.evaluate
+			def evaluate(engine)
+				left.evaluate(engine) * right.evaluate(engine)
 			end
 		end
 		class DivisionNode < Node
-			def evaluate
-				left.evaluate / right.evaluate
+			def evaluate(engine)
+				left.evaluate(engine) / right.evaluate(engine)
 			end
 		end
 		

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: math_engine
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Baldry
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
         - 2
-        - 0
-        version: 0.2.0
+        - 2
+        version: 0.2.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency