added required methods #parent, #parent: and #source to the XPathExpression
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 22 Nov 2008 07:18:59 +0000
changeset 24 9a2db6739a5a
parent 23 6fbb595a44bc
child 25 45cef3cc61d5
added required methods #parent, #parent: and #source to the XPathExpression
xpath/trunk/XMLv2__XPathAnyKindTest.st
xpath/trunk/XMLv2__XPathAxisAncestor.st
xpath/trunk/XMLv2__XPathAxisAncestorOrSelf.st
xpath/trunk/XMLv2__XPathAxisChild.st
xpath/trunk/XMLv2__XPathAxisDescendant.st
xpath/trunk/XMLv2__XPathAxisDescendantOrSelf.st
xpath/trunk/XMLv2__XPathAxisFollowingSibling.st
xpath/trunk/XMLv2__XPathAxisParent.st
xpath/trunk/XMLv2__XPathAxisPrecedingSibling.st
xpath/trunk/XMLv2__XPathAxisSelf.st
xpath/trunk/XMLv2__XPathExpression.st
xpath/trunk/XMLv2__XPathNameTest.st
xpath/trunk/XMLv2__XPathNode.st
xpath/trunk/stx_goodies_xmlsuite_xpath.st
--- a/xpath/trunk/XMLv2__XPathAnyKindTest.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAnyKindTest.st	Sat Nov 22 07:18:59 2008 +0000
@@ -10,7 +10,6 @@
 !
 
 
-
 !XPathAnyKindTest methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisAncestor.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisAncestor.st	Sat Nov 22 07:18:59 2008 +0000
@@ -10,7 +10,6 @@
 !
 
 
-
 !XPathAxisAncestor methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisAncestorOrSelf.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisAncestorOrSelf.st	Sat Nov 22 07:18:59 2008 +0000
@@ -10,7 +10,6 @@
 !
 
 
-
 !XPathAxisAncestorOrSelf methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisChild.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisChild.st	Sat Nov 22 07:18:59 2008 +0000
@@ -19,7 +19,6 @@
     "Modified: / 13-10-2006 / 20:44:32 / janfrog"
 ! !
 
-
 !XPathAxisChild methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisDescendant.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisDescendant.st	Sat Nov 22 07:18:59 2008 +0000
@@ -20,7 +20,6 @@
     "Modified: / 13-10-2006 / 20:43:47 / janfrog"
 ! !
 
-
 !XPathAxisDescendant methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisDescendantOrSelf.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisDescendantOrSelf.st	Sat Nov 22 07:18:59 2008 +0000
@@ -19,7 +19,6 @@
     "Modified: / 13-10-2006 / 20:43:35 / janfrog"
 ! !
 
-
 !XPathAxisDescendantOrSelf methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisFollowingSibling.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisFollowingSibling.st	Sat Nov 22 07:18:59 2008 +0000
@@ -10,7 +10,6 @@
 !
 
 
-
 !XPathAxisFollowingSibling methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisParent.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisParent.st	Sat Nov 22 07:18:59 2008 +0000
@@ -23,7 +23,6 @@
     "Modified: / 13-10-2006 / 20:42:51 / janfrog"
 ! !
 
-
 !XPathAxisParent methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisPrecedingSibling.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisPrecedingSibling.st	Sat Nov 22 07:18:59 2008 +0000
@@ -10,7 +10,6 @@
 !
 
 
-
 !XPathAxisPrecedingSibling methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathAxisSelf.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathAxisSelf.st	Sat Nov 22 07:18:59 2008 +0000
@@ -18,7 +18,6 @@
     "Modified: / 13-10-2006 / 20:42:29 / janfrog"
 ! !
 
-
 !XPathAxisSelf methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathExpression.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathExpression.st	Sat Nov 22 07:18:59 2008 +0000
@@ -3,7 +3,7 @@
 "{ NameSpace: XMLv2 }"
 
 OrderedCollection subclass:#XPathExpression
-	instanceVariableNames:'absolute startPosition stopPosition'
+	instanceVariableNames:'absolute parent startPosition stopPosition'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'XML Suite-XPath'
@@ -38,6 +38,27 @@
     "Created: / 17-11-2007 / 14:48:46 / janfrog"
 !
 
+parent
+    ^ parent
+
+    "Created: / 22-11-2008 / 08:11:11 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+parent:something
+    parent := something.
+
+    "Created: / 22-11-2008 / 08:11:11 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
+source
+
+    ^parent 
+        ifNil:[nil]
+        ifNotNil:[parent source]
+
+    "Created: / 22-11-2008 / 08:11:42 / Jan Vrany <vranyj1@fel.cvut.cz>"
+!
+
 startPosition
     ^ startPosition
 
--- a/xpath/trunk/XMLv2__XPathNameTest.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathNameTest.st	Sat Nov 22 07:18:59 2008 +0000
@@ -70,7 +70,6 @@
     "Modified: / 15-11-2007 / 21:52:21 / janfrog"
 ! !
 
-
 !XPathNameTest methodsFor:'printing'!
 
 printOn: stream
--- a/xpath/trunk/XMLv2__XPathNode.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/XMLv2__XPathNode.st	Sat Nov 22 07:18:59 2008 +0000
@@ -101,6 +101,12 @@
    ^ adaptor isNodeText:self.
 ! !
 
+!XPathNode::XPathNodePosition class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !
+
 !XPathNode::XPathNodePosition methodsFor:'accessing'!
 
 attributePosition
--- a/xpath/trunk/stx_goodies_xmlsuite_xpath.st	Mon Nov 10 18:05:47 2008 +0000
+++ b/xpath/trunk/stx_goodies_xmlsuite_xpath.st	Sat Nov 22 07:18:59 2008 +0000
@@ -7,6 +7,7 @@
 	category:'* Projects & Packages *'
 !
 
+
 !stx_goodies_xmlsuite_xpath class methodsFor:'description'!
 
 preRequisites
@@ -16,11 +17,12 @@
         #'stx:goodies/sunit'    "TestCase - superclass of XMLv2::XPathExpressionOptimizerTests "
         #'stx:goodies/xml/vw'    "XML::Document - referenced by XMLv2::XPathVWDocumentAdaptor class>>documentClass "
         #'stx:goodies/xmlsuite/core'    "XMLv2::XMLReader - superclass of XMLv2::XPathDOMAdaptorXMLReader "
+        #'stx:goodies/xmlsuite/xquery'    "XQuery::XQueryResultXMLReader - referenced by XMLv2::XPathDocumentAdaptor>>importForeignNode:adaptor: "
         #'stx:libbasic'    "Object - superclass of XMLv2::XPathDOM3DocumentAdaptor "
         #'stx:libbasic2'    "List - referenced by XMLv2::XPathExprTreeNode>>subnodes "
     )
 
-    "Modified: / 08-04-2008 / 22:46:43 / Jan Vrany <vranyj1@fel.cvut.cz>"
+    "Modified: / 22-11-2008 / 08:17:34 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
 !stx_goodies_xmlsuite_xpath class methodsFor:'description - contents'!
@@ -119,3 +121,8 @@
     ^ 'Smalltalk/X'
 ! !
 
+!stx_goodies_xmlsuite_xpath class methodsFor:'documentation'!
+
+version
+    ^'$Id$'
+! !