lexr 0.2.2 → 0.2.3

data/lib/lexr.rb

@@ -14,11 +14,10 @@ class Lexr
 	def next
 		return @current = Lexr::Token.end if @position >= @text.length
 		@rules.each do |rule|
-			if result = rule.pattern.instance_of?(Regexp) ? regexp_match(rule.pattern) : literal_match(rule.pattern)
-				result = rule.converter[result] if rule.converter
-				return self.send :next if rule.ignore?
-				return @current = Lexr::Token.new(result, rule.symbol)
-			end
+		  next unless result = rule.match(unprocessed_text)
+		  @position += result.characters_matched
+		  return self.next if rule.ignore?
+		  return @current = result.token
 		end
 		raise Lexr::UnmatchableTextError.new(unprocessed_text[0..0], @position)
 	end
@@ -46,18 +45,6 @@ class Lexr
 		@text[@position..-1]
 	end
 	
-	def regexp_match(regex)
-		return nil unless m = unprocessed_text.match(/^#{regex}/)
-		@position += m.end(0)
-		m[0]
-	end
-	
-	def literal_match(lit)
-		return nil unless unprocessed_text[0..lit.length-1] == lit
-		@position += lit.length
-		lit
-	end
-	
 	class Token
 		attr_reader :value, :type
 	
@@ -87,6 +74,13 @@ class Lexr
 		def initialize(pattern, symbol, opts = {})
 			@pattern, @symbol, @opts = pattern, symbol, opts
 		end
+	  
+	  def match(text)
+	    text_matched = self.send :"#{pattern.class.name.downcase}_matcher", text
+	    return nil unless text_matched
+	    value = converter ? converter[text_matched] : text_matched
+	    Lexr::MatchData.new(text_matched.length, Lexr::Token.new(value, symbol))
+    end
 		
 		def ==(other)
 			@pattern == other.pattern && 
@@ -94,6 +88,18 @@ class Lexr
 				@opts[:convert_with] == other.converter && 
 				@opts[:ignore] == other.ignore?
 		end
+		
+		private
+		
+		def string_matcher(text)
+		  return nil unless text[0..pattern.length-1] == pattern
+      pattern
+	  end
+	  
+	  def regexp_matcher(text)
+	    return nil unless m = text.match(/\A#{pattern}/)
+		  m[0]
+    end
 	end
 	
 	class Dsl
@@ -132,4 +138,13 @@ class Lexr
 			message
 		end
 	end
+	
+	class MatchData
+	  attr_reader :characters_matched, :token
+	  
+	  def initialize(characters_matched, token)
+	    @characters_matched = characters_matched
+	    @token = token
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lexr
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Michael Baldry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +00:00
+date: 2011-05-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A lightweight and pretty lexical analyser