kaiseki 1.3.1 → 1.3.2

data/lib/extras.rb

@@ -0,0 +1,29 @@
+module Kaiseki
+	LITERAL = CustomParser.new do
+		@stream.lock do
+			term = @stream.getc
+			failed = true
+			string = ''
+			raise ParseError.new "unexpected character \"#{term}\" (expected \"\"\" or \"\'\") when parsing #{self}", @options[:rule] unless term == '"' or term == "'"
+			while char = @stream.getc
+				if char == term
+					failed = false
+					break
+				elsif char == '\\'
+					if match = @stream.match(/\d+/)
+						string << Kernel.eval("\"\\#{match}\"")
+					else
+						string << Kernel.eval("\"\\#{@stream.getc}\"")
+					end
+				else
+					string << char
+				end
+			end
+			if failed
+				raise ParseError.new "unexpected end-of-string (expected \"#{term}\") when parsing #{self}", @options[:rule]
+			else
+				string
+			end
+		end
+	end
+end

data/lib/kaiseki.rb

@@ -1,5 +1,5 @@
 module Kaiseki
-	VERSION = '1.3.1'
+	VERSION = '1.3.2'
 	file_path = File.dirname __FILE__
 	
 	#load basic kaiseki classes
@@ -28,6 +28,7 @@ module Kaiseki
 	require file_path + '/parser_sequence'
 	require file_path + '/parser_choice'
 	require file_path + '/parser_repeat'
+	require file_path + '/parser_list'
 	
 	require file_path + '/parser_package'
 	
@@ -63,4 +64,5 @@ module Kaiseki
 	
 	#load others
 	require file_path + '/parser_custom'
+	require file_path + '/extras'
 end

data/lib/parseable.rb

@@ -22,7 +22,7 @@ module Kaiseki
 					block.call
 					throw :ParseSuccess
 				end
-				raise RuntimeError, "#{self.to_s} must not catch a SkipSuccess"
+				raise RuntimeError, "#{self} must not catch a SkipSuccess"
 			end
 		end
 		
@@ -50,6 +50,10 @@ module Kaiseki
 			repeat 1
 		end
 		
+		def list delimiter = ','
+			ListParser.new self, delimiter
+		end
+		
 		def and?
 			AndPredicate.new self
 		end

data/lib/parser_list.rb

@@ -0,0 +1,77 @@
+module Kaiseki
+	class ListParser
+		include Parseable
+		attr_reader :expected, :delimiter
+		
+		def initialize expected, delimiter = ','
+			raise ArgumentError, "expected must not be a predicate" if expected.predicate?
+			@expected = expected
+			@delimiter = delimiter
+		end
+		
+		def eql? other
+			other.is_a?(self.class) and other.expected == @expected and other.delimiter = @delimiter
+		end
+		
+		alias :== :eql?
+		
+		def to_s
+			"#{@expected}#{@delimiter} ..."
+		end
+		
+		private
+		def parse! stream, options = {}
+			result = []
+			loop do
+				begin
+					catch :SkipSuccess do
+						result << @expected.parse(stream, options)
+					end
+				rescue ParseError => e
+					if options[:skipping]
+						begin
+							protect do
+								options[:skipping].parse stream, options.merge(:skipping => nil)
+							end
+							redo
+						rescue ParseError
+							raise e
+						end
+					else
+						raise e
+					end
+				end
+				begin
+					protect do
+						@delimiter.parse stream, options
+					end
+				rescue ParseError => e
+					if options[:skipping]
+						begin
+							protect do
+								options[:skipping].parse stream, options.merge(:skipping => nil)
+							end
+							redo
+						rescue ParseError
+							break
+						end
+					else
+						break
+					end
+				end
+			end
+			if options[:simplify]
+				case result.length
+				when 0
+					throw :SkipSuccess
+				when 1
+					result[0]
+				else
+					result
+				end
+			else
+				result
+			end
+		end
+	end
+end

data/lib/stream.rb

@@ -22,6 +22,10 @@ module Kaiseki
 			end
 		end
 		
+		def eof?
+			@pos == @string.length
+		end
+		
 		def match regexp
 			match = @string[@pos..-1].match /\A#{regexp}/
 			if match

metadata

@@ -2,7 +2,7 @@
 name: kaiseki
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,13 @@ extra_rdoc_files: []
 files: 
 - lib/result_merge.rb
 - lib/var_get.rb
+- lib/parser_list.rb
 - lib/parser_package.rb
 - lib/var_set.rb
 - lib/mod_object.rb
 - lib/parser_string.rb
 - lib/node.rb
+- lib/extras.rb
 - lib/predicate_skip.rb
 - lib/parser_choice.rb
 - lib/predicate_not.rb
@@ -92,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A parsing expression grammar generator