kaiseki 1.0.7 → 1.0.8

data/lib/grammar.rb

@@ -28,7 +28,7 @@ module Kaiseki
 			stream.lock do
 				default_options = {
 					:grammar => self,
-					:rule => 'main',
+					:rule => '(main)',
 					:skipping => @skipping_rule,
 					:simplify => @simplify,
 					:global => {},
@@ -43,12 +43,13 @@ module Kaiseki
 		
 		def starting parseable
 			raise "starting rule already defined" if @starting_rule
-			@starting_rule = parseable
+			@starting_rule = parseable.to_parseable
 		end
 		
 		def skipping parseable
 			raise "skipping rule already defined" if @skipping_rule
-			@skipping_rule = parseable
+			raise "skipping rule must not be a predicate" if parseable.predicate?
+			@skipping_rule = parseable.to_parseable
 		end
 		
 		def simplify bool = true

data/lib/grammar_stub.rb

@@ -2,7 +2,7 @@ module Kaiseki
 	class GrammarStub < PackageParser
 		attr_reader :grammar, :rule
 		
-		def initialize expected, grammar, rule = 'main'
+		def initialize expected, grammar, rule = '(main)'
 			super expected
 			@grammar = grammar
 			@rule = rule
@@ -11,7 +11,7 @@ module Kaiseki
 		def parse! stream, options = {}
 			default_options = {
 				:grammar => @grammar,
-				:rule => @rule,
+				:rule => @rule.to_s,
 				:skipping => @grammar.skipping_rule,
 				:simplify => @grammar.simplify,
 				:global => {}

data/lib/kaiseki.rb

@@ -1,5 +1,5 @@
 module Kaiseki
-	VERSION = '1.0.7'
+	VERSION = '1.0.8'
 	file_path = File.dirname __FILE__
 	
 	#load basic kaiseki classes
@@ -30,7 +30,6 @@ module Kaiseki
 	require file_path + '/parser_repeat'
 	
 	require file_path + '/parser_package'
-	require file_path + '/parser_custom'
 	
 	#load predicates
 	require file_path + '/predicate_and'
@@ -54,4 +53,7 @@ module Kaiseki
 	require file_path + '/var_set'
 	require file_path + '/var_get'
 	require file_path + '/var_insert'
+	
+	#load others
+	require file_path + '/parser_custom'
 end

data/lib/parse_error.rb

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

data/lib/parse_result.rb

@@ -10,12 +10,12 @@ module Kaiseki
 				end
 				@result = '(skipped)'
 			rescue ParseError => e
-				@error = e
+				@error = e.verbose
 			end
 		end
 		
-		def has_errors?
-			!!@error
+		def parsed?
+			@result ? true : false
 		end
 	end
 end

data/lib/parseable.rb

@@ -12,6 +12,16 @@ module Kaiseki
 			false
 		end
 		
+		def protect &block
+			catch :ParseSuccess do
+				catch :SkipSuccess do
+					block.call
+					throw :ParseSuccess
+				end
+				raise RuntimeError, "#{self.to_s} must not catch a SkipSuccess"
+			end
+		end
+		
 		def & other
 			SequenceParser.new self, other
 		end

data/lib/parser_choice.rb

@@ -21,6 +21,10 @@ module Kaiseki
 		
 		alias :| :append
 		
+		def predicate?
+			@expected.find {|n| n.predicate? } ? true : false
+		end
+		
 		def delimiter
 			'|'
 		end

data/lib/parser_custom.rb

@@ -1,26 +1,21 @@
 module Kaiseki
-	attr_reader :name
-	
 	class CustomParser < BasicParser
-		def initialize name = nil, is_predicate = false, &block
+		NODE = Node.subclass [:stream, :options]
+		
+		def initialize 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
+				NODE.new([stream, options], options[:global]).eval options[:global], &@expected
 			end
 		end
 		
 		def predicate?
 			@is_predicate
 		end
-		
-		def to_s
-			@name || @expected.inspect
-		end
 	end
 end

data/lib/parser_repeat.rb

@@ -4,7 +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?
+			raise ArgumentError, "expected must not be a predicate" if expected.predicate?
 			@expected = expected.to_parseable
 			@min = min
 			@max = max
@@ -16,13 +16,13 @@ module Kaiseki
 				result = []
 				while @max.nil? or result.length < @max
 					begin
-						catch :SkipSuccess do
+						protect do
 							result << @expected.parse(stream, options)
 						end
 					rescue ParseError
 						if options[:skipping]
 							begin
-								catch :SkipSuccess do
+								protect do
 									options[:skipping].parse stream, options.merge(:skipping => nil)
 								end
 								redo

data/lib/parser_sequence.rb

@@ -12,7 +12,7 @@ module Kaiseki
 					rescue ParseError => e
 						if options[:skipping]
 							begin
-								catch :SkipSuccess do
+								protect do
 									options[:skipping].parse stream, options.merge(:skipping => nil)
 								end
 								redo
@@ -27,7 +27,14 @@ module Kaiseki
 					end
 				end
 				if options[:simplify]
-					result.length == 1 ? result[0] : result
+					case result.length
+					when 0
+						throw :SkipSuccess
+					when 1
+						result[0]
+					else
+						result
+					end
 				else
 					result
 				end
@@ -36,6 +43,10 @@ module Kaiseki
 		
 		alias :& :append
 		
+		def predicate?
+			@expected.find {|n| !n.predicate? } ? false : true
+		end
+		
 		def delimiter
 			'&'
 		end

data/lib/parser_symbol.rb

@@ -3,7 +3,7 @@ module Kaiseki
 		def parse! stream, options = {}
 			if options[:grammar]
 				if options[:grammar].rules[@expected]
-					options[:grammar].rules[@expected].parse stream, options.merge(:rule => @expected)
+					options[:grammar].rules[@expected].parse stream, options.merge(:rule => @expected.to_s)
 				else
 					STDERR.puts "skipping #{self}: not implemented"
 					raise NotImplementedError

data/lib/rule.rb

@@ -18,11 +18,11 @@ module Kaiseki
 			end
 		end
 		
-		def custom &block
+		def custom is_predicate = false, &block
 			if @parseable
 				raise "parseable for rule #{@name.inspect} already defined"
 			else
-				@parseable = CustomParser.new &block
+				@parseable = CustomParser.new is_predicate, &block
 			end
 		end
 		
@@ -36,6 +36,7 @@ module Kaiseki
 		
 		def skipping parseable
 			if @parseable
+				raise "skipping rule must not be a predicate" if parseable.predicate?
 				@parseable = @parseable.override :skipping => parseable.to_parseable
 			else
 				raise "parseable for rule #{@name.inspect} undefined"

data/lib/stream.rb

@@ -50,8 +50,8 @@ module Kaiseki
 				throw :SkipSuccess
 			rescue ParseError => e
 				@pos = safe_pos
-				#e.line ||= self.line
-				#e.column ||= self.column
+				e.line ||= self.line
+				e.column ||= self.column
 				raise e
 			end
 		end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -05:00
+date: 2011-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: []