rFlex 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d1411f324f26e88afc9c45dc3ceeb35baa089f6
-  data.tar.gz: 24a7faa87472ac481a14475142845b3cee93ff1d
+  metadata.gz: adcfbb66ef4f56d0a01f895cabce1b505889c40c
+  data.tar.gz: 47733bbfe72c8d69b79bb53f87dcc341b619f27e
 SHA512:
-  metadata.gz: b721b4b5e32188a778168fd2006754e066832e7b9ba8ef300c179c0e7336458abbb31af91c9cf5144356f5d0ff1643932e1d83482828852efa6d0949d914c8ec
-  data.tar.gz: d140e1023b1447d514a811a1f0d59e444f321fa4dc3b20d327b0d5de86e6cd23b63b9ca241877bd61dfdf0ab02100c84ce164e40aac80f2bd0af78389b6b9c3f
+  metadata.gz: 535c77e88bb146829e57b9c1fe0a79acb8b66667c53c32e699074a62f926be6af773921840aefc3aff847630a573c4f102a1c4758f422f3aec07a9fda005fe8e
+  data.tar.gz: eaca0a215ceee7f18dfc0f5cd9ec9458d8e0c94337e8ccefec27d48ed9bbe90c1ba3240f9a61949a4f9ec0843688c405f4f8e30658c27cae3571f081b40b4292

data/lib/rflex.rb

@@ -23,14 +23,78 @@ class TokenLexer
 
 	def lex input
 
-		if token = input.slice!(@regexp)
+		inputT = input
+		temp = self.sliceL(inputT)
+		token = ""
+		if temp == nil
+			raise "\n\nUnconsumed Input:\n\n[#{inputT}]\n\n"
+		else	
+			token = temp[:token]
+		end
+
+		if token.length >= 1
 			if @block != nil
 				analyze(token, @regexp, @type)
 			end
-			return true
+			if temp[:inputS].length == 0 # token is not empty and remaining input is empty
+				return { :success => true, :inputS => temp[:inputS], :done => true, :error => false }
+			else # token is not empty and remaining input is not empty
+				return { :success => true, :inputS => temp[:inputS], :done => false, :error => false }
+			end
+		else
+			if temp[:inputS].length >= 1 # token is empty and remaining input is not empty 
+				# error
+				#raise "\n\nUnconsumed Input:\n\n[#{temp[:inputS]}]\n\n"
+				return { :success => false, :inputS => input, :done => false, :error => true }
+			else
+				# token is empty and input is not
+				return { :success => false, :inputS => input, :done => false, :error => false }
+			end 
 		end
+	end
+
+	def sliceL input
 
-		return false
+		# puts "\n\n"
+
+		if input == nil
+			return { :token => "", :input => input }
+		end
+
+		len = input.length
+		ii = 0
+		temp = ""
+		curMatch = ""
+		matched = false
+		inputT = input
+
+		until ii == len do
+
+			temp.concat(input[ii])
+			# print "[#{input[ii]}]"
+			if temp.match(@regexp)
+				matched = true
+				curMatch = temp
+				ii += 1
+				if ii == len
+					inputT = inputT[(ii)..-1].to_s
+					return { :token => curMatch[0..-1], :inputS => inputT }
+				end
+				next
+			else
+				ii += 1
+				if matched
+					inputT = inputT[(ii - 1)..-1].to_s
+					return { :token => curMatch[0..-2], :inputS => inputT }
+				else
+					if ii == len
+						return { :token => "", :inputS => inputT }
+					else
+						next
+					end
+				end
+			end
+		end
 	end
 
 	def analyze token, regex, type
@@ -104,21 +168,31 @@ class LexicalAnalyzer
 			input.concat("#{line}")
 		end
 
-		input = input[0..-2].to_s
+		# input = input[0..-1].to_s
+		inputT = input
 
 		len = @lexers.length - 1
 		j = 0
 
 		matched = false
 
-		until input.length == 0
+		until inputT.length == 0
+			tempLex = { :success => false, :inputS => inputT }
 			0.upto(len) do |i|
-
-				if @lexers[i].lex(input)
-					matched = true
+				j = i
+				tempLex = @lexers[i].lex(inputT)
+
+				if tempLex[:success]
+					matched = tempLex[:success]
+					inputT = tempLex[:inputS]
+					if inputT.length == 0
+						break
+					end
 				else
+					matched = false
 				end
-				j = i
+
+				# j = i
 			end
 
 			# if we tried all options
@@ -126,9 +200,9 @@ class LexicalAnalyzer
 			# we didn't match
 			# and
 			# there is remaining input
-			if j == len and matched == false and input.length != 0
-				puts "\n\nUnconsumed Input:\n\n#{input}\n\n"
-				abort
+			## puts "j: #{j}, len: #{len}, matched: #{matched}, input: #{inputT}, length: #{inputT.length}, done: #{tempLex[:done]}, error: #{tempLex[:error]}"
+			if (j == len) and tempLex[:error]
+				raise "\n\nUnconsumed Input:\n\n\"#{inputT}\"\n\n"
 			end
 
 			matched = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rFlex
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Alice "Duchess" Archer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-11 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies: []
 description: ruby lexical analysis library
 email: iarcher@pdx.edu