olavo_calculator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e733ad4d0f46a7173286053f503bcac62a58169
-  data.tar.gz: 5eff90191846361fcfe74aac041e6ed17df18b69
+  metadata.gz: 8fb77dc3076d776b6cc55c77e0d8745a95cc6a3f
+  data.tar.gz: d08dd0d9685d831816f5a849bfa9a4b504146e17
 SHA512:
-  metadata.gz: efa3c3c25254100aafacefce67366fe122ea8912f56a4b2eb901fe2bd50fb69802eeeae2c106130aef6970dc264dfe6977d00c2f748ce7411b766e711177bfbd
-  data.tar.gz: 4877f84c3daa2951157469baf2d10ebb5e152f143bf7ab242555bc87964c1e8c38778601ff69c568f37e67eab4498cb7bc186f4de19ed71bc360d506b877836d
+  metadata.gz: c72c091c88690c077d5c0943c05a4faaafd5d2a2ed227f65ba6bce17ba4ef1843e3631a731736e39f45fe05bab7d9e7d885c18006102408701ff76faa711b79c
+  data.tar.gz: 1c29c7c667886857fc401ce2aee837513da77390b302871f370f0090ba12c0dd5e19ce351727b911a82a1f3e8f2d054cf43882744e32b8d5b3c0e155e8aff6a1

data/lib/olavo_calculator.rb

@@ -7,6 +7,6 @@ require "olavo_calculator/parser"
 module OlavoCalculator
 	def self.solve string
 		token_array = Lexer.new.tokenize string
-		Parser.parse token_array
+		Parser.new.parse token_array
 	end
 end

data/lib/olavo_calculator/cli.rb

@@ -6,7 +6,7 @@ module OlavoCalculator
 		desc("solve EXPRESSION", "Solves the given EXPRESSION and returns the result")
 		def solve expression
 			puts OlavoCalculator.solve expression
-    rescue Exception => e
+    rescue OlavoException => e
       puts e.message
 		end
 

data/lib/olavo_calculator/parser.rb

@@ -6,69 +6,71 @@ class OlavoCalculator::Parser
 		:open_key			=> :close_key
 	}
 
-	def self.parse token_array
-		detect_expression token_array
+	def parse token_array
+    @token_array = token_array
+		detect_expression
 	end
 
 	# expressões podem ser da forma: priority (PLUS|MINUS expr)*, term
-	def self.detect_expression token_array
-		raise "Unexpected Ending" if token_array.empty?
-		value = detect_priority token_array
+  private
+  def detect_expression
+		raise OlavoException, "Unexpected Ending" if @token_array.empty?
+		value = detect_priority
 
-		return value if token_array.empty?
+		return value if @token_array.empty?
 
-		next_token = token_array.shift
+		next_token = @token_array.shift
 
 		while next_token && [:plus, :minus].include?(next_token.type) do
-			value += detect_term(token_array) if next_token.type == :plus
-			value -= detect_term(token_array) if next_token.type == :minus
-			next_token = token_array.shift
+			value += detect_term if next_token.type == :plus
+			value -= detect_term if next_token.type == :minus
+			next_token = @token_array.shift
 		end
 
-		token_array.unshift next_token
-		token_array.unshift OlavoCalculator::Token.new(:number, value)
+		@token_array.unshift next_token
+		@token_array.unshift OlavoCalculator::Token.new(:number, value)
 
-		detect_term token_array
+		detect_term
 	end
 
 	# prioridades podem ser da forma: (expr), [expr], {expr}, term
-	def self.detect_priority token_array
-		raise "Unexpected Ending" if token_array.empty?
+	def detect_priority
+		raise OlavoException, "Unexpected Ending" if @token_array.empty?
 		
-		if PRIORITY_SEMANTICS.key? token_array[0].type
-			priority = token_array.shift
-			value = detect_expression token_array
-			raise "Semantic Error" unless token_array.shift.type == PRIORITY_SEMANTICS[priority.type]
+		if PRIORITY_SEMANTICS.key? @token_array[0].type
+			priority = @token_array.shift
+			value = detect_expression
+			raise OlavoException, "Semantic Error" unless @token_array.shift.type == PRIORITY_SEMANTICS[priority.type]
 			return value
 		end
 
-		detect_term token_array
+		detect_term
 	end
 
 	# termos podem ser da forma: factor ((MULT|DIV) factor)*
-	def self.detect_term token_array
-		raise "Unexpected Ending" if token_array.empty?
-		value = detect_factor token_array
+	def detect_term
+		raise OlavoException, "Unexpected Ending" if @token_array.empty?
+		value = detect_factor
 
-		return value if token_array.empty?
+		return value if @token_array.empty?
 		
-		next_token = token_array.shift
+		next_token = @token_array.shift
 
 		while next_token && [:mult, :div].include?(next_token.type) do
-			value *= detect_factor(token_array) if next_token.type == :mult
-			value /= detect_factor(token_array) if next_token.type == :div
-			next_token = token_array.shift
+			value *= detect_factor if next_token.type == :mult
+			value /= detect_factor if next_token.type == :div
+			next_token = @token_array.shift
 		end
 
-		token_array.unshift next_token unless next_token.nil?
+		@token_array.unshift next_token unless next_token.nil?
 
 		value
 	end
 
 	# fatores podem ser da forma: NUMBER, priority
-	def self.detect_factor token_array
-		raise "Unexpected Ending" if token_array.empty?
-		return token_array.shift.value if token_array[0].type == :number
-		detect_priority token_array
+	def detect_factor
+		raise OlavoException, "Unexpected Ending" if @token_array.empty?
+		return @token_array.shift.value if @token_array[0].type == :number
+		detect_priority
 	end
 end

data/lib/olavo_calculator/version.rb

@@ -1,3 +1,3 @@
 module OlavoCalculator
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: olavo_calculator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Carlos Cardoso Dias