kaiseki 1.0.6 → 1.0.7

data/lib/kaiseki.rb

@@ -1,5 +1,5 @@
 module Kaiseki
-	VERSION = '1.0.6'
+	VERSION = '1.0.7'
 	file_path = File.dirname __FILE__
 	
 	#load basic kaiseki classes
@@ -30,6 +30,7 @@ module Kaiseki
 	require file_path + '/parser_repeat'
 	
 	require file_path + '/parser_package'
+	require file_path + '/parser_custom'
 	
 	#load predicates
 	require file_path + '/predicate_and'

data/lib/parse_error.rb

@@ -10,7 +10,7 @@ module Kaiseki
 		end
 		
 		def verbose
-			to_s
+			"#{@line ? @line + 1 : 0}:#{@column ? @column + 1 : 0}:#{to_s}"
 		end
 	end
 end

data/lib/parseable.rb

@@ -8,6 +8,10 @@ module Kaiseki
 			self.to_parseable.parse! stream.to_stream, options
 		end
 		
+		def predicate?
+			false
+		end
+		
 		def & other
 			SequenceParser.new self, other
 		end

data/lib/parser_custom.rb

@@ -0,0 +1,26 @@
+module Kaiseki
+	attr_reader :name
+	
+	class CustomParser < BasicParser
+		def initialize name = nil, is_predicate = false, &block
+			super block
+			@name = name
+			@is_predicate = is_predicate
+		end
+		
+		def parse! stream, options = {}
+			stream.must_be Stream
+			stream.lock do
+				@expected.call stream, options
+			end
+		end
+		
+		def predicate?
+			@is_predicate
+		end
+		
+		def to_s
+			@name || @expected.inspect
+		end
+	end
+end

data/lib/parser_package.rb

@@ -4,6 +4,10 @@ module Kaiseki
 			super expected.to_parseable
 		end
 		
+		def predicate?
+			@expected.predicate?
+		end
+		
 		def to_s
 			@expected.to_s
 		end

data/lib/parser_repeat.rb

@@ -4,6 +4,7 @@ module Kaiseki
 		attr_reader :expected, :min, :max
 		
 		def initialize expected, min, max = nil
+			raise "RepeatParser can't be initalized with a predicate" if expected.predicate?
 			@expected = expected.to_parseable
 			@min = min
 			@max = max

data/lib/predicate_and.rb

@@ -12,6 +12,10 @@ module Kaiseki
 			end
 		end
 		
+		def predicate?
+			true
+		end
+		
 		def to_s
 			"#{@expected}.and?"
 		end

data/lib/predicate_not.rb

@@ -12,6 +12,10 @@ module Kaiseki
 			end
 		end
 		
+		def predicate?
+			true
+		end
+		
 		def to_s
 			"#{@expected}.not!"
 		end

data/lib/predicate_skip.rb

@@ -12,6 +12,10 @@ module Kaiseki
 			end
 		end
 		
+		def predicate?
+			true
+		end
+		
 		def to_s
 			"#{@expected}.skip"
 		end

data/lib/rule.rb

@@ -18,6 +18,14 @@ module Kaiseki
 			end
 		end
 		
+		def custom &block
+			if @parseable
+				raise "parseable for rule #{@name.inspect} already defined"
+			else
+				@parseable = CustomParser.new &block
+			end
+		end
+		
 		def override options
 			if @parseable
 				@parseable = @parseable.override options

data/lib/stream.rb

@@ -4,13 +4,13 @@ module Kaiseki
 		
 		def initialize string
 			if string.is_a? File
-				@string = ''
-				string.each_char {|n| @string << n }
+				@string = string.to_a.join
 			else
 				@string = string.to_s
 			end
 			@pos = 0
-			#index_lines
+			@newlines = []
+			index_lines
 		end
 		
 		def getc
@@ -32,14 +32,6 @@ module Kaiseki
 			end
 		end
 		
-		def look len = 10
-			if @string.length - @pos > len
-				"\"#{@string[@pos, len - 3] + '...'}\""
-			else
-				"\"#{@string[@pos..-1]}\""
-			end
-		end
-		
 		def goto pos
 			if pos < 0
 				@pos = 0
@@ -79,20 +71,36 @@ module Kaiseki
 		alias :size :length
 		
 		def line
-			
+			bsearch @pos, 0, @newlines.length
 		end
 		
 		def column
-			
+			@pos - @newlines[self.line][0]
 		end
 		
 		private
 		def index_lines
-			
+			@newlines = []
+			start = 0
+			@string.length.times do |i|
+				if @string[i] == "\n"
+					@newlines << [start, i]
+					start = i + 1
+				end
+			end
+			@newlines << [start, @string.length]
 		end
 		
-		def bsearch
-			
+		def bsearch value, low, high
+			return nil if high < low
+			mid = low + (high - low) / 2
+			if value < @newlines[mid][0]
+				bsearch value, low, mid - 1
+			elsif value > @newlines[mid][1]
+				bsearch value, mid + 1, high
+			else
+				mid
+			end
 		end
 	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-24 00:00:00 -05:00
+date: 2011-01-08 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +52,7 @@ files:
 - lib/grammar_stub.rb
 - lib/parser_sequence.rb
 - lib/mod_symbol.rb
+- lib/parser_custom.rb
 - lib/parser_eof.rb
 - lib/parse_result.rb
 - lib/parser_symbol.rb