summaryrefslogtreecommitdiff
path: root/lib/rexml/validation/relaxng.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/rexml/validation/relaxng.rb')
-rw-r--r--lib/rexml/validation/relaxng.rb21
1 files changed, 0 insertions, 21 deletions
diff --git a/lib/rexml/validation/relaxng.rb b/lib/rexml/validation/relaxng.rb
index 2441901d7b..370efd5a98 100644
--- a/lib/rexml/validation/relaxng.rb
+++ b/lib/rexml/validation/relaxng.rb
@@ -145,7 +145,6 @@ module REXML
def next( event )
#print "In next with #{event.inspect}. "
- #puts "Next (#@current) is #{@events[@current]}"
#p @previous
return @previous.pop.next( event ) if @events[@current].nil?
expand_ref_in( @events, @current ) if @events[@current].class == Ref
@@ -154,19 +153,15 @@ module REXML
@events[@current-1].previous = self
return @events[@current-1].next( event )
end
- #puts "Current isn't a state"
if ( @events[@current].matches?(event) )
@current += 1
if @events[@current].nil?
- #puts "#{inspect[0,5]} 1RETURNING #{@previous.inspect[0,5]}"
return @previous.pop
elsif @events[@current].kind_of? State
@current += 1
- #puts "#{inspect[0,5]} 2RETURNING (#{@current-1}) #{@events[@current-1].inspect[0,5]}; on return, next is #{@events[@current]}"
@events[@current-1].previous = self
return @events[@current-1]
else
- #puts "#{inspect[0,5]} RETURNING self w/ next(#@current) = #{@events[@current]}"
return self
end
else
@@ -393,13 +388,10 @@ module REXML
# Remove the references
# Find the events
end
- #puts "In next with #{event.inspect}."
- #puts "events is #{@events.inspect}"
unless @events
@events = []
return nil
end
- #puts "current = #@current"
super
end
@@ -409,8 +401,6 @@ module REXML
end
def expected
- #puts "IN CHOICE EXPECTED"
- #puts "EVENTS = #{@events.inspect}"
return [@events[@current]] if @events.size > 0
return @choices.collect do |x|
if x[0].kind_of? State
@@ -479,8 +469,6 @@ module REXML
@choice += 1
end
- #puts "In next with #{event.inspect}."
- #puts "events is #{@events.inspect}"
@events = [] unless @events
end
@@ -491,29 +479,22 @@ module REXML
return nil unless @events[@current]
expand_ref_in( @events, @current ) if @events[@current].class == Ref
- #puts "In next with #{event.inspect}."
- #puts "Next (#@current) is #{@events[@current]}"
if ( @events[@current].kind_of? State )
@current += 1
@events[@current-1].previous = self
return @events[@current-1].next( event )
end
- #puts "Current isn't a state"
return @previous.pop.next( event ) if @events[@current].nil?
if ( @events[@current].matches?(event) )
@current += 1
if @events[@current].nil?
- #puts "#{inspect[0,5]} 1RETURNING self" unless @choices[@choice].nil?
return self unless @choices[@choice].nil?
- #puts "#{inspect[0,5]} 1RETURNING #{@previous[-1].inspect[0,5]}"
return @previous.pop
elsif @events[@current].kind_of? State
@current += 1
- #puts "#{inspect[0,5]} 2RETURNING (#{@current-1}) #{@events[@current-1].inspect[0,5]}; on return, next is #{@events[@current]}"
@events[@current-1].previous = self
return @events[@current-1]
else
- #puts "#{inspect[0,5]} RETURNING self w/ next(#@current) = #{@events[@current]}"
return self
end
else
@@ -527,8 +508,6 @@ module REXML
end
def expected
- #puts "IN CHOICE EXPECTED"
- #puts "EVENTS = #{@events.inspect}"
return [@events[@current]] if @events[@current]
return @choices[@choice..-1].collect do |x|
if x[0].kind_of? State