From 2f5bd9d6d7c0a1520713e63b941f7f7c7dfd340e Mon Sep 17 00:00:00 2001
From: ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Aug 2005 12:08:52 +0000
Subject: * Fixed the inheritance bug in the pull parser that James Britt
 found. * Indentation changes, and changed some exceptions to runtime  
 exceptions. * Backed out the patch that changed the versions * Wasn't
 including Text class. * Fixes issue:25 (Trac) * Fixes ticket:3 (Issue38 in
 Roundup.) * Numerous fixes in the XPath interpreter correcting, among other  
 things, ordering bugs and some incorrect behavior.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rexml/xpath.rb | 117 ++++++++++++++++++++++++-----------------------------
 1 file changed, 53 insertions(+), 64 deletions(-)

(limited to 'lib/rexml/xpath.rb')

diff --git a/lib/rexml/xpath.rb b/lib/rexml/xpath.rb
index 6875f038e..1ed440868 100644
--- a/lib/rexml/xpath.rb
+++ b/lib/rexml/xpath.rb
@@ -2,76 +2,65 @@ require 'rexml/functions'
 require 'rexml/xpath_parser'
 
 module REXML
-  # Wrapper class.  Use this class to access the XPath functions.
-  class XPath
-    include Functions
-    EMPTY_HASH = {}
+	# Wrapper class.  Use this class to access the XPath functions.
+	class XPath
+		include Functions
+		EMPTY_HASH = {}
 
-    # Finds and returns the first node that matches the supplied xpath.
-    # element::
-    #   The context element
-    # path::
-    #   The xpath to search for.  If not supplied or nil, returns the first
-    #   node matching '*'.
-    # namespaces::
-    #   If supplied, a Hash which defines a namespace mapping.
-    #
-    #  XPath.first( node )
-    #  XPath.first( doc, "//b"} )
-    #  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
+		# Finds and returns the first node that matches the supplied xpath.
+		# element::
+		# 	The context element
+		# path::
+		# 	The xpath to search for.  If not supplied or nil, returns the first
+		# 	node matching '*'.
+		# namespaces::
+		# 	If supplied, a Hash which defines a namespace mapping.
+		#
+		#  XPath.first( node )
+		#  XPath.first( doc, "//b"} )
+		#  XPath.first( node, "a/x:b", { "x"=>"http://doofus" } )
     def XPath::first element, path=nil, namespaces={}, variables={}
-=begin
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.kind_of? Hash
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of? Hash
-      parser = XPathParser.new
-      parser.namespaces = namespaces
-      parser.variables = variables
-      path = "*" unless path
-      parser.first( path, element );
-=end
-#=begin
-      raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.kind_of? Hash
-      raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of? Hash
-      parser = XPathParser.new
-      parser.namespaces = namespaces
-      parser.variables = variables
-      path = "*" unless path
-      element = [element] unless element.kind_of? Array
-      parser.parse(path, element).flatten[0]
-#=end
-    end
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path, element).flatten[0]
+		end
 
-    # Itterates over nodes that match the given path, calling the supplied
-    # block with the match.
-    # element::
-    #   The context element
-    # path::
-    #   The xpath to search for.  If not supplied or nil, defaults to '*'
-    # namespaces::
-    #   If supplied, a Hash which defines a namespace mapping
-    #
-    #  XPath.each( node ) { |el| ... }
-    #  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
-    #  XPath.each( node, 'ancestor::x' ) { |el| ... }
-    def XPath::each element, path=nil, namespaces={}, variables={}, &block
+		# Itterates over nodes that match the given path, calling the supplied
+		# block with the match.
+		# element::
+		#   The context element
+		# path::
+		#   The xpath to search for.  If not supplied or nil, defaults to '*'
+		# namespaces::
+		# 	If supplied, a Hash which defines a namespace mapping
+		#
+		#  XPath.each( node ) { |el| ... }
+		#  XPath.each( node, '/*[@attr='v']' ) { |el| ... }
+		#  XPath.each( node, 'ancestor::x' ) { |el| ... }
+		def XPath::each element, path=nil, namespaces={}, variables={}, &block
       raise "The namespaces argument, if supplied, must be a hash object." unless namespaces.kind_of? Hash
       raise "The variables argument, if supplied, must be a hash object." unless variables.kind_of? Hash
-      parser = XPathParser.new
-      parser.namespaces = namespaces
-      parser.variables = variables
-      path = "*" unless path
-      element = [element] unless element.kind_of? Array
-      parser.parse(path, element).each( &block )
-    end
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path, element).each( &block )
+		end
 
-    # Returns an array of nodes matching a given XPath.  
-    def XPath::match element, path=nil, namespaces={}, variables={}
-      parser = XPathParser.new
-      parser.namespaces = namespaces
-      parser.variables = variables
-      path = "*" unless path
-      element = [element] unless element.kind_of? Array
-      parser.parse(path,element)
-    end
-  end
+		# Returns an array of nodes matching a given XPath.  
+		def XPath::match element, path=nil, namespaces={}, variables={}
+			parser = XPathParser.new
+			parser.namespaces = namespaces
+			parser.variables = variables
+			path = "*" unless path
+			element = [element] unless element.kind_of? Array
+			parser.parse(path,element)
+		end
+	end
 end
-- 
cgit