kaiseki 1.2.5 → 1.3.1

data/lib/grammar.rb

@@ -19,21 +19,21 @@ module Kaiseki
 		
 		def parse stream, options = {}
 			raise 'starting rule undefined' unless @starting_rule
+			result = ParseResult.new
 			default_options = {
 				:grammar => self,
-				:result => ParseResult.new,
-				:global => {},
+				:result => result,
 				:rule => '(main)',
 				:skipping => @skipping_rule,
 				:simplify => @simplify
 			}
 			options = default_options.merge options
 			begin
-				options[:result].results[:main] = @starting_rule.parse stream.to_stream, options
+				result.results[:main] = @starting_rule.parse stream.to_stream, options
 			rescue ParseError => e
-				options[:result].errors[:main] = e
+				result.errors[:main] = e
 			end
-			options[:result]
+			result
 		end
 		
 		def starting parseable

data/lib/grammar_stub.rb

@@ -18,7 +18,6 @@ module Kaiseki
 		def parse! stream, options = {}
 			default_options = {
 				:grammar => @grammar,
-				:global => {},
 				:rule => @rule.to_s,
 				:skipping => @grammar.skipping_rule,
 				:simplify => @grammar.simplify,

data/lib/kaiseki.rb

@@ -1,5 +1,5 @@
 module Kaiseki
-	VERSION = '1.2.5'
+	VERSION = '1.3.1'
 	file_path = File.dirname __FILE__
 	
 	#load basic kaiseki classes

data/lib/mod_object.rb

@@ -3,9 +3,4 @@ class Object
 		raise TypeError, "can't convert #{self.class} into #{item}" unless self.is_a? item
 		true
 	end
-	
-	def must_have property, value
-		raise StandardError, "##{property} must be #{value} (#{self.send(property)})" unless self.send(property) == value
-		true
-	end
 end

data/lib/parse_error.rb

@@ -1,16 +1,23 @@
 module Kaiseki
 	class ParseError < StandardError
-		attr_accessor :rule, :line, :column
+		attr_accessor :rule, :child, :line, :column
 		
-		def initialize string, options
+		def initialize string, rule, child = nil
 			super string
-			@rule = options[:rule]
-			@line = nil
-			@column = nil
+			@rule = rule
+			@child = child
 		end
 		
 		def verbose
 			"[#{@line ? @line + 1 : 0}:#{@column ? @column + 1 : 0}] #{to_s} [in #{@rule}]"
 		end
+		
+		def parsetrace
+			array = [self]
+			while array.last.child
+				array << array.last.child
+			end
+			array.reverse
+		end
 	end
 end

data/lib/parse_result.rb

@@ -22,5 +22,9 @@ module Kaiseki
 		def error_msg error = :main
 			@errors.key?(error) ? @errors[error].verbose : nil
 		end
+		
+		def backtrace error = :main
+			@errors.key?(error) ? @errors[error].parsetrace.collect {|n| n.verbose } : nil
+		end
 	end
 end

data/lib/parseable.rb

@@ -5,6 +5,7 @@ module Kaiseki
 		end
 		
 		def parse stream, options = {}
+			options[:global] ||= {}
 			stream = stream.to_stream
 			stream.lock do
 				parse! stream, options
@@ -99,6 +100,7 @@ module Kaiseki
 		
 		private
 		def parse! stream, options = {}
+			raise NotImplementedError, "#{self.class} does not have an implemented #parse!" if self.to_parseable == self
 			self.to_parseable.parse stream, options
 		end
 	end

data/lib/parser_choice.rb

@@ -12,19 +12,19 @@ module Kaiseki
 		
 		private
 		def parse! stream, options = {}
-			error = true
+			error = nil
 			@expected.each do |n|
 				begin
 					catch :SkipSuccess do
 						return n.parse stream, options
 					end
-				rescue ParseError
+				rescue ParseError => error
 					next
-				rescue NotImplementedError
+				rescue NotImplementedError => error
 					next
 				end
 			end
-			raise ParseError.new "no valid alternatives when parsing #{self}", options
+			raise ParseError.new "no valid alternatives when parsing #{self}", options[:rule], error
 		end
 	end
 end

data/lib/parser_eof.rb

@@ -16,7 +16,7 @@ module Kaiseki
 		def parse! stream, options = {}
 			actual = stream.getc
 			if actual
-				raise ParseError.new "unexpected character \"#{actual}\" (expected end-of-string) when parsing #{self}", options
+				raise ParseError.new "unexpected character \"#{actual}\" (expected end-of-string) when parsing #{self}", options[:rule]
 			else
 				true
 			end

data/lib/parser_regexp.rb

@@ -10,7 +10,7 @@ module Kaiseki
 					match
 				end
 			else
-				raise ParseError.new "non-matching characters when parsing #{self}", options
+				raise ParseError.new "non-matching characters when parsing #{self}", options[:rule]
 			end
 		end
 	end

data/lib/parser_repeat.rb

@@ -27,12 +27,13 @@ module Kaiseki
 		private
 		def parse! stream, options = {}
 			result = []
+			error = nil
 			while @max.nil? or result.length < @max
 				begin
 					protect do
 						result << @expected.parse(stream, options)
 					end
-				rescue ParseError
+				rescue ParseError => error
 					if options[:skipping]
 						begin
 							protect do
@@ -45,12 +46,12 @@ module Kaiseki
 					else
 						break
 					end
-				rescue NotImplementedError
+				rescue NotImplementedError => error
 					break
 				end
 			end
 			if result.length < @min
-				raise ParseError.new "expected #{@min} match#{'es' unless @min == 1} but obtained #{result.length} when parsing #{self}", options
+				raise ParseError.new "expected #{@min} match#{'es' unless @min == 1} but obtained #{result.length} when parsing #{self}", options[:rule], error
 			else
 				if options[:simplify]
 					if @min == 0 and @max == 1

data/lib/parser_string.rb

@@ -6,9 +6,9 @@ module Kaiseki
 			@expected.each_char do |char|
 				actual = stream.getc
 				if actual.nil?
-					raise ParseError.new "unexpected end-of-string (expected \"#{char}\") when parsing #{self}", options
+					raise ParseError.new "unexpected end-of-string (expected \"#{char}\") when parsing #{self}", options[:rule]
 				elsif actual != char
-					raise ParseError.new "unexpected character \"#{actual}\" (expected \"#{char}\") when parsing #{self}", options
+					raise ParseError.new "unexpected character \"#{actual}\" (expected \"#{char}\") when parsing #{self}", options[:rule]
 				end
 			end
 			@expected.dup

data/lib/predicate_and.rb

@@ -13,7 +13,7 @@ module Kaiseki
 			begin
 				@expected.parse stream, options
 			rescue ParseError => e
-				raise ParseError.new "predicate not satisfied when parsing #{self}: #{e.to_s}", options
+				raise ParseError.new "predicate not satisfied when parsing #{self}: #{e.to_s}", options[:rule], e
 			end
 			throw :PredicateSuccess
 		end

data/lib/predicate_not.rb

@@ -15,7 +15,7 @@ module Kaiseki
 			rescue ParseError
 				throw :PredicateSuccess
 			end
-			raise ParseError.new "predicate not satisfied when parsing #{self}: matched #{result}", options
+			raise ParseError.new "predicate not satisfied when parsing #{self}: matched #{result}", options[:rule]
 		end
 	end
 end

data/lib/predicate_skip.rb

@@ -13,7 +13,7 @@ module Kaiseki
 			begin
 				@expected.parse stream, options
 			rescue ParseError => e
-				raise ParseError.new "predicate not satisfied when parsing #{self}: #{e.to_s}", options
+				raise ParseError.new "predicate not satisfied when parsing #{self}: #{e.to_s}", options[:rule], e
 			end
 			throw :SkipSuccess
 		end

data/lib/result_validate.rb

@@ -32,7 +32,7 @@ module Kaiseki
 			if passed
 				result
 			else
-				raise ParseError.new "`#{result}' does not pass validation", options
+				raise ParseError.new "`#{result}' does not pass validation", options[:rule]
 			end
 		end
 	end

data/lib/var_get.rb

@@ -34,7 +34,7 @@ module Kaiseki
 			elsif source == result
 				result
 			else
-				raise ParseError.new "unexpected result #{result.inspect} (expected #{source.inspect}) when parsing #{@parser}", options
+				raise ParseError.new "unexpected result #{result.inspect} (expected #{source.inspect}) when parsing #{@parser}", options[:rule]
 			end
 		end
 	end

metadata

@@ -2,7 +2,7 @@
 name: kaiseki
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.5
+  version: 1.3.1
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -05:00
+date: 2011-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []