olavo_calculator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ca2d1111c63e314d0bd9770d27d09d5594cdd9
-  data.tar.gz: d77214aecffde3b00a761bb9242a19107aacb9fc
+  metadata.gz: 7e733ad4d0f46a7173286053f503bcac62a58169
+  data.tar.gz: 5eff90191846361fcfe74aac041e6ed17df18b69
 SHA512:
-  metadata.gz: ba877e24f22e89f9c6a00c4c850f2fbd5c77597ac064c89a964ae622db3e0cf74e940c002459083ab4a7b30055f9c10101a7101799a8b6616768c1b7756e04bc
-  data.tar.gz: dfa4f7ebdeb255b6abc16d34040813c11c00ed3e86f2b6c4c6fdb906962d3680a91b7b46da511234d1fa00ae0645c4cafff70f702982659646dd40740640d69a
+  metadata.gz: efa3c3c25254100aafacefce67366fe122ea8912f56a4b2eb901fe2bd50fb69802eeeae2c106130aef6970dc264dfe6977d00c2f748ce7411b766e711177bfbd
+  data.tar.gz: 4877f84c3daa2951157469baf2d10ebb5e152f143bf7ab242555bc87964c1e8c38778601ff69c568f37e67eab4498cb7bc186f4de19ed71bc360d506b877836d

data/lib/olavo_calculator/cli.rb

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

data/lib/olavo_calculator/lexer.rb

@@ -13,55 +13,58 @@ class OlavoCalculator::Lexer
 		:'/' => :div
 	}
 
-	def self.tokenize string
-		tokens = []
+	def tokenize string
+		@tokens = []
+    @string = string
+
 		last_token = nil
 		i = 0
 
-		while i < string.length do
-			i = detect_token(string, i, tokens)
+		while i < @string.length do
+			i = detect_token i
 		end
 
-		tokens
+		@tokens
 	end
 
-	def self.detect_token string, index, tokens
-		current = string[index]
+  private
+	def detect_token index
+		current = @string[index]
 
-		if current =~ /\s/
-			return index + 1
-		end
+    return (index + 1) if current =~ /\s/
 		
-		if current =~ /\d/ || (current =~ /-/ && (index + 1) < string.length && string[index + 1] =~ /\d/)
-			return detect_number string, index, tokens
-		end
+    return detect_number(index) if current =~ /\d/ || negative?(index)
 
 		if TOKENS.keys.include? current.to_sym
-			tokens << OlavoCalculator::Token.new(TOKENS[current.to_sym], current.to_sym)
+			@tokens << OlavoCalculator::Token.new(TOKENS[current.to_sym], current.to_sym)
 			return index + 1
 		end
 
-		raise "Syntax Error"
+		raise OlavoException, "Syntax Error"
 	end
 
-	def self.detect_number string, index, tokens
-		number = string[index]
+  def negative?(index)
+    @string[index] =~ /-/ && (index + 1) < @string.length && @string[index + 1] =~ /\d/
+  end
+
+	def detect_number index
+		number = @string[index]
 
-		index = get_number number, string, index + 1
+		index = get_number number, index + 1
 
-		if index + 1 < string.length && string[index] =~ /\./ && string[index + 1] =~ /\d/
+		if index + 1 < @string.length && @string[index] =~ /\./ && @string[index + 1] =~ /\d/
 			number << '.'
-			index = get_number number, string, index + 1
+			index = get_number number, index + 1
 		end
 
-		tokens << OlavoCalculator::Token.new(:number, number.to_f)
+		@tokens << OlavoCalculator::Token.new(:number, number.to_f)
 
 		index
 	end
 
-	def self.get_number number, string, index
-		while index < string.length && string[index] =~ /\d/ do
-			number << string[index]
+	def get_number number, index
+		while index < @string.length && @string[index] =~ /\d/ do
+			number << @string[index]
 			index += 1
 		end
 

data/lib/olavo_calculator/olavo_exception.rb

@@ -0,0 +1,2 @@
+class OlavoException < Exception
+end

data/lib/olavo_calculator/version.rb

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

data/lib/olavo_calculator.rb

@@ -1,11 +1,12 @@
 require "olavo_calculator/version"
+require "olavo_calculator/olavo_exception"
 require "olavo_calculator/token"
 require "olavo_calculator/lexer"
 require "olavo_calculator/parser"
 
 module OlavoCalculator
 	def self.solve string
-		token_array = Lexer.tokenize string
+		token_array = Lexer.new.tokenize string
 		Parser.parse token_array
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: olavo_calculator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Carlos Cardoso Dias
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -86,6 +86,7 @@ files:
 - lib/olavo_calculator.rb
 - lib/olavo_calculator/cli.rb
 - lib/olavo_calculator/lexer.rb
+- lib/olavo_calculator/olavo_exception.rb
 - lib/olavo_calculator/parser.rb
 - lib/olavo_calculator/token.rb
 - lib/olavo_calculator/version.rb