r1002 | ser | 2004-06-07 07:45:53 -0400 (Mon, 07 Jun 2004) | 2 lines

* Workin' in the coal mine, goin' down, down, down...
r1003 | ser | 2004-06-08 22:24:08 -0400 (Tue, 08 Jun 2004) | 7 lines
* Entirely rewrote the validation code; the finite state machine, while cool,
  didn't survive the encounter with Interleave.  It was getting sort of hacky,
  too.  The new mechanism is less elegant, but is basically still a FSM, and is
  more flexible without having to add hacks to extend it.  Large chunks of the
  FSM may be reusable in other validation mechanisms.
* Added interleave support
r1004 | ser | 2004-06-09 07:24:17 -0400 (Wed, 09 Jun 2004) | 2 lines
* Added suppert for mixed
r1005 | ser | 2004-06-09 08:01:33 -0400 (Wed, 09 Jun 2004) | 3 lines
* Added Kou's patch to normalize attribute values passed through the SAX2 and
  Stream parsers.
r1006 | ser | 2004-06-09 08:12:35 -0400 (Wed, 09 Jun 2004) | 2 lines
* Applied Kou's preceding-sibling patch, which fixes the order of the axe results
r1009 | ser | 2004-06-20 11:02:55 -0400 (Sun, 20 Jun 2004) | 8 lines
* Redesigned and rewrote the RelaxNG code.  It isn't elegant, but it works.
  Particular problems encountered were interleave and ref.  Interleave means I
  can't use a clean FSM design, and ref means the dirty FSM design has to be modified
  during validation.  There's a lot of code that could be cleaned up in here.
  However, I'm pretty sure that this design is reasonably fast and space efficient.
  I'm not entirely convinced that it is correct; more tests are required.
* This version adds support for defines and refs.
r1011 | ser | 2004-06-20 11:20:07 -0400 (Sun, 20 Jun 2004) | 3 lines
* Removed debugging output from unit test
* Moved ">" in Element.inspect
r1014 | ser | 2004-06-20 11:40:30 -0400 (Sun, 20 Jun 2004) | 2 lines
* Minor big in missing includes for validation rules
r1023 | ser | 2004-07-03 08:57:34 -0400 (Sat, 03 Jul 2004) | 2 lines
* Fixed bug #34, typo in xpath_parser.
r1024 | ser | 2004-07-03 10:22:08 -0400 (Sat, 03 Jul 2004) | 9 lines
* Previous fix, (include? -> includes?) was incorrect.
* Added another test for encoding
* Started AnyName support in RelaxNG
* Added Element#Attributes#to_a, so that it does something intelligent.
  This was needed by XPath, for '@*'
* Fixed XPath so that @* works.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

5 files changed, 23 insertions, 14 deletions

diff --git a/lib/rexml/element.rb b/lib/rexml/element.rb
index 27886a90bc..25e530de41 100644
--- a/lib/rexml/element.rb
+++ b/lib/rexml/element.rb
@@ -74,10 +74,9 @@ module REXML
         rv << " "
         attr.write( rv, 0 )
       end
-      rv << ">"
 
       if children.size > 0
-        rv << " ... </>"
+        rv << "> ... </>"
       else
         rv << "/>"
       end
@@ -976,6 +975,10 @@ module REXML
 			return nil
 		end
 
+		def to_a
+			values.flatten
+		end
+
 		# Returns the number of attributes the owning Element contains.
 		#  doc = Document "<a x='1' y='2' foo:x='3'/>"
 		#  doc.root.attributes.length        #-> 3
diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index 16e5c80237..e95cba8904 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -306,8 +306,9 @@ module REXML
 							last_tag = @tags.pop
 							#md = @source.match_to_consume( '>', CLOSE_MATCH)
 							md = @source.match( CLOSE_MATCH, true )
-							raise REXML::ParseException.new( "Missing end tag for '#{last_tag}' "+
-								"(got \"#{md[1]}\")", @source) unless last_tag == md[1]
+							raise REXML::ParseException.new( "Missing end tag for "+
+                "'#{last_tag}' (got \"#{md[1]}\")", 
+                @source) unless last_tag == md[1]
 							return [ :end_element, last_tag ]
 						elsif @source.buffer[1] == ?!
 							md = @source.match(/\A(\s*[^>]*>)/um)
diff --git a/lib/rexml/parsers/treeparser.rb b/lib/rexml/parsers/treeparser.rb
index 931da73025..57d11f7e23 100644
--- a/lib/rexml/parsers/treeparser.rb
+++ b/lib/rexml/parsers/treeparser.rb
@@ -1,3 +1,5 @@
+require 'rexml/validation/validationexception'
+
 module REXML
   module Parsers
     class TreeParser
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index 5bdc0bb867..bf905b20e2 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -21,7 +21,7 @@
 # online[http://www.germane-software.com/software/rexml/docs/tutorial.html]
 module REXML
 	Copyright = "Copyright © 2001, 2002, 2003, 2004 Sean Russell <ser@germane-software.com>"
-	Date = "+2004/162"
-	Version = "3.1.1"
+	Date = "+2004/186"
+	Version = "3.1.2"
 
 end
diff --git a/lib/rexml/xpath_parser.rb b/lib/rexml/xpath_parser.rb
index ce6cec5374..5a976d5e82 100644
--- a/lib/rexml/xpath_parser.rb
+++ b/lib/rexml/xpath_parser.rb
@@ -151,13 +151,14 @@ module REXML
             end
           end
         when :any
+					#puts "ANY"
           for element in nodeset
             if element.node_type == :element
-              attr = element.attributes
+              new_nodeset += element.attributes.to_a
             end
           end
         end
-        #puts "RETURNING #{new_nodeset.collect{|n|n.to_s}.inspect}"
+				#puts "RETURNING #{new_nodeset.collect{|n|n.to_s}.inspect}"
         return new_nodeset
 
       when :parent
@@ -182,7 +183,7 @@ module REXML
             new_nodeset << node
             while ( node.parent )
               node = node.parent
-              new_nodeset << node unless new_nodeset.includes? node
+              new_nodeset << node unless new_nodeset.include? node
             end
           end
         end
@@ -429,10 +430,9 @@ module REXML
     end
 
     def equality_relational_compare( set1, op, set2 )
-      #puts "EQ_REL_COMP: #{set1.to_s}, #{op}, #{set2.to_s}"
-      #puts "#{set1.class.name} #{op} #{set2.class.name}"
+			#puts "#"*80
       if set1.kind_of? Array and set2.kind_of? Array
-        #puts "#{set1.size} & #{set2.size}"
+				#puts "#{set1.size} & #{set2.size}"
         if set1.size == 1 and set2.size == 1
           set1 = set1[0]
           set2 = set2[0]
@@ -450,6 +450,7 @@ module REXML
           return false
         end
       end
+			#puts "EQ_REL_COMP: #{set1.class.name} #{set1.inspect}, #{op}, #{set2.class.name} #{set2.inspect}"
       #puts "COMPARING VALUES"
       # If one is nodeset and other is number, compare number to each item
       # in nodeset s.t. number op number(string(item))
@@ -458,7 +459,7 @@ module REXML
       # If one is nodeset and other is boolean, compare boolean to each item
       # in nodeset s.t. boolean op boolean(item)
       if set1.kind_of? Array or set2.kind_of? Array
-        #puts "ISA ARRAY"
+				#puts "ISA ARRAY"
         if set1.kind_of? Array
           a = set1
           b = set2.to_s
@@ -485,8 +486,10 @@ module REXML
             return true if compare( v, op, b )
           end
         else
+					#puts "Functions::string( #{b}(#{b.class.name}) ) = #{Functions::string(b)}"
           b = Functions::string( b )
           for v in a
+						#puts "v = #{v.class.name} #{v.inspect}"
             v = Functions::string(v)
             return true if compare( v, op, b )
           end
@@ -529,7 +532,7 @@ module REXML
     end
 
     def compare a, op, b
-      #puts "COMPARE #{a.to_s} #{op} #{b.to_s}"
+			#puts "COMPARE #{a.to_s}(#{a.class.name}) #{op} #{b.to_s}(#{a.class.name})"
       case op
       when :eq
         a == b