kaiseki 1.0.9 → 1.1.1

data/lib/kaiseki.rb

@@ -1,5 +1,5 @@
 module Kaiseki
-	VERSION = '1.0.9'
+	VERSION = '1.1.1'
 	file_path = File.dirname __FILE__
 	
 	#load basic kaiseki classes
@@ -41,6 +41,8 @@ module Kaiseki
 	require file_path + '/result_merge'
 	require file_path + '/result_cast'
 	require file_path + '/result_filter'
+	require file_path + '/result_action'
+	require file_path + '/result_validate'
 	require file_path + '/node'
 	
 	#load grammar classes

data/lib/parseable.rb

@@ -74,6 +74,14 @@ module Kaiseki
 			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

data/lib/result_action.rb

@@ -0,0 +1,23 @@
+module Kaiseki
+	class ActionResult < FilterResult
+		def parse! stream, options = {}
+			if @node.is_a? Class
+				node_class = @node
+			else
+				if options[:grammar]
+					node_class = options[:grammar].nodes[@node]
+				else
+					raise "can't use named nodes without a grammar"
+				end
+			end
+			result = @expected.parse stream, options
+			if result.is_a? Array
+				node = node_class.new result, options[:global]
+			else
+				node = node_class.new [result]
+			end
+			node.eval options[:global], &@block
+			result
+		end
+	end
+end

data/lib/result_validate.rb

@@ -0,0 +1,38 @@
+module Kaiseki
+	class ValidateResult < PackageParser
+		attr_reader :validators
+		
+		def initialize expected, validators
+			super expected
+			@validators = validators
+		end
+		
+		def parse! stream, options = {}
+			result = @expected.parse stream, options
+			passed = true
+			@validators.each do |key, value|
+				case key
+				when :includes
+					passed = false unless value.find {|n| n === result }
+				when :excludes
+					passed = false if value.find {|n| n === result }
+				when :is
+					passed = false unless value.member? result
+				when :not
+					passed = false if value.member? result
+				end
+			end
+			if passed
+				result
+			else
+				raise ParseError.new "`#{result}' does not pass validation", options
+			end
+		end
+		
+		def eql? other
+			other.is_a?(self.class) and other.expected == @expected and other.validators == @validators
+		end
+		
+		alias :== :eql?
+	end
+end

data/lib/rule.rb

@@ -78,6 +78,25 @@ module Kaiseki
 			end
 		end
 		
+		def action node = @name, &block
+			if @parseable
+				unless @grammar.nodes.key? @name
+					@grammar.nodes[@name] = Node.default
+				end
+				@parseable = @parseable.action node, &block
+			else
+				raise "parseable for rule #{@name.inspect} undefined"
+			end
+		end
+		
+		def validates validators
+			if @parseable
+				@parseable = @parseable.validate validators
+			else
+				raise "parseable for rule #{@name.inspect} undefined"
+			end
+		end
+		
 		def node args, options = {}
 			args.must_be Array
 			if @grammar.nodes.key? @name

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
-  - 9
-  version: 1.0.9
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - William Hamilton-Levi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 -05:00
+date: 2011-01-24 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -54,8 +54,10 @@ files:
 - lib/mod_symbol.rb
 - lib/parser_custom.rb
 - lib/parser_eof.rb
+- lib/result_validate.rb
 - lib/parse_result.rb
 - lib/parser_symbol.rb
+- lib/result_action.rb
 - lib/mod_proc.rb
 - lib/grammar.rb
 - lib/parser_basic.rb