lexr 0.1.0 → 0.2.0

data/README.md

@@ -1,8 +1,15 @@
-## Lexr
+# Lexr
 
 Lexr is a lightweight lexical analyser written in ruby, it has no dependencies, has good test coverage, looks pretty and reads well.
 
-# An example: Expressions
+Install with
+
+	gem install lexr
+
+## An example: Expressions
+
+	require 'rubygems'
+	require 'lexr'
 
 	ExpressionLexer = Lexr.that {
 		ignores /\s+/ => :whitespace
@@ -17,8 +24,8 @@ Lexr is a lightweight lexical analyser written in ruby, it has no dependencies,
 
 	lexer = ExpressionLexer.new("1 * 12.5 / (55 + 2 - 56)")
 
-	while (token = lexer.next) != Lexr::Token.end
-		puts token
+	until lexer.end?
+		puts lexer.next
 	end
 
 results in an output of
@@ -34,9 +41,10 @@ results in an output of
 	subtraction(-)
 	number(56.0)
 	right_parenthesis())
+	end()
 	
 if you added a % in there somewhere, you'd get a Lexr::UnmatchableTextError with a message like this:
 
 	=> Unexpected character '%' at position 5
 	
-and that pretty is every feature so far. Please let me know of any bugs or additions that you'd like to see!
+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/lexr.rb

@@ -7,36 +7,51 @@ class Lexr
 	
 	def initialize(text, rules)
 		@text, @rules = text, rules
+		@current = nil
 		@position = 0
 	end
 
-	def next
-		return Lexr::Token.end if @position >= @text.length
+	def next(peeking = false)
+		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)
+			if result = rule.pattern.instance_of?(Regexp) ? regexp_match(rule.pattern, peeking) : literal_match(rule.pattern, peeking)
 				result = rule.converter[result] if rule.converter
 				return self.send(:next) if rule.ignore?
-				return Lexr::Token.new(result, rule.symbol)
+				token = Lexr::Token.new(result, rule.symbol)
+				return @current = token unless peeking
+				return token
 			end
 		end
 		raise Lexr::UnmatchableTextError.new(unprocessed_text[0..0], @position)
 	end
 	
+	def peek
+		self.send(:next, true)
+	end
+	
+	def current
+		@current
+	end
+	
+	def end?
+		@current == Lexr::Token.end
+	end
+	
 	private
 	
 	def unprocessed_text
 		@text[@position..-1]
 	end
 	
-	def regexp_match(regex)
+	def regexp_match(regex, peeking = false)
 		return nil unless m = unprocessed_text.match(/^#{regex}/)
-		@position += m.end(0)
+		@position += m.end(0) unless peeking
 		m[0]
 	end
 	
-	def literal_match(lit)
+	def literal_match(lit, peeking = false)
 		return nil unless unprocessed_text[0..lit.length-1] == lit
-		@position += lit.length
+		@position += lit.length unless peeking
 		lit
 	end
 	

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lexr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Michael Baldry
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +00:00
+date: 2010-11-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency