kaiseki 1.2.1 → 1.2.2

data/lib/kaiseki.rb

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

data/lib/parseable.rb

@@ -5,7 +5,7 @@ module Kaiseki
 		end
 		
 		def parse stream, options = {}
-			stream = stream.to_parseable
+			stream = stream.to_stream
 			stream.lock do
 				self.to_parseable.parse! stream, options
 			end

data/lib/parseable.rb~

@@ -0,0 +1,100 @@
+module Kaiseki
+	module Parseable
+		def to_parseable
+			self
+		end
+		
+		def parse stream, options = {}
+			stream = stream.to_parseable
+			stream.lock do
+				self.to_parseable.parse! stream, options
+			end
+		end
+		
+		def predicate?
+			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
+		
+		def | other
+			ChoiceParser.new self, other
+		end
+		
+		def repeat min, max = nil
+			RepeatParser.new self, min, max
+		end
+		
+		def optional
+			repeat 0, 1
+		end
+		
+		def zero_or_more
+			repeat 0
+		end
+		
+		def one_or_more
+			repeat 1
+		end
+		
+		def and?
+			AndPredicate.new self
+		end
+		
+		def not!
+			NotPredicate.new self
+		end
+		
+		def skip
+			SkipPredicate.new self
+		end
+		
+		def override options
+			OverrideResult.new self, options
+		end
+		
+		def merge
+			MergeResult.new self
+		end
+		
+		def cast to_class
+			CastResult.new self, to_class
+		end
+		
+		def filter node = Node.default, &block
+			FilterResult.new self, node, &block
+		end
+		
+		def action node = Node.default, &block
+			ActionResult.new self, node, &block
+		end
+		
+		def validate validators
+			ValidateResult.new self, validators
+		end
+		
+		def set *vars
+			SetVar.new self, *vars
+		end
+		
+		def tag_result name
+			ResultTag.new self, name
+		end
+		
+		def tag_error name
+			ErrorTag.new self, name
+		end
+	end
+end

metadata

@@ -2,7 +2,7 @@
 name: kaiseki
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -26,6 +26,7 @@ extra_rdoc_files: []
 files: 
 - lib/result_merge.rb
 - lib/var_get.rb
+- lib/parseable.rb~
 - lib/parser_package.rb
 - lib/var_set.rb
 - lib/mod_object.rb