kaiseki 1.0.5 → 1.0.6

data/lib/grammar.rb

@@ -14,7 +14,7 @@ module Kaiseki
 		end
 		
 		def [] rule
-			GrammarStub.new @rules[rule], self
+			GrammarStub.new @rules[rule], self, rule
 		end
 		
 		def parse stream, options = {}

data/lib/grammar_stub.rb

@@ -1,14 +1,22 @@
 module Kaiseki
 	class GrammarStub < PackageParser
-		attr_reader :grammar
+		attr_reader :grammar, :rule
 		
-		def initialize expected, grammar
+		def initialize expected, grammar, rule = 'main'
 			super expected
 			@grammar = grammar
+			@rule = rule
 		end
 		
 		def parse! stream, options = {}
-			@expected.parse stream, options.merge(:grammar => @grammar)
+			default_options = {
+				:grammar => @grammar,
+				:rule => @rule,
+				:skipping => @grammar.skipping_rule,
+				:simplify => @grammar.simplify,
+				:global => {}
+			}
+			@expected.parse stream, default_options.merge(options)
 		end
 		
 		def eql? other

data/lib/kaiseki.rb

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

data/lib/parser_choice.rb

@@ -6,16 +6,13 @@ module Kaiseki
 				error = true
 				@expected.each do |n|
 					begin
-						value = catch :SkipSuccess do
+						catch :SkipSuccess do
 							return n.parse stream, options
 						end
-						if value == :NotImplemented
-							next
-						else
-							throw :SkipSuccess
-						end
 					rescue ParseError
 						next
+					rescue NotImplementedError
+						next
 					end
 				end
 				raise ParseError.new "no valid alternatives when parsing #{self}", options

data/lib/parser_repeat.rb

@@ -13,16 +13,11 @@ module Kaiseki
 			stream.must_be Stream
 			stream.lock do
 				result = []
-				count = 0
-				while max.nil? or count < @max
+				while @max.nil? or result.length < @max
 					begin
 						catch :SkipSuccess do
 							result << @expected.parse(stream, options)
-							count += 1
-							next
 						end
-						count += 1
-						break if max.nil?
 					rescue ParseError
 						if options[:skipping]
 							begin
@@ -36,6 +31,8 @@ module Kaiseki
 						else
 							break
 						end
+					rescue NotImplementedError
+						break
 					end
 				end
 				if result.length < @min

data/lib/parser_sequence.rb

@@ -22,6 +22,8 @@ module Kaiseki
 						else
 							raise e
 						end
+					rescue NotImplementedError
+						next
 					end
 				end
 				if options[:simplify]

data/lib/parser_symbol.rb

@@ -6,7 +6,7 @@ module Kaiseki
 					options[:grammar].rules[@expected].parse stream, options.merge(:rule => @expected)
 				else
 					STDERR.puts "skipping #{self}: not implemented"
-					throw :SkipSuccess, :NotImplemented
+					raise NotImplementedError
 				end
 			else
 				raise "can't use #{self} without a grammar"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - William Hamilton-Levi