dbertoni 01/06/27 11:26:12
Modified: c/src/XPath XPath.cpp XPath.hpp
Log:
Map node() to different pseudo-names.
Revision Changes Path
1.55 +6 -2 xml-xalan/c/src/XPath/XPath.cpp
Index: XPath.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- XPath.cpp 2001/06/25 15:16:18 1.54
+++ XPath.cpp 2001/06/27 18:26:07 1.55
@@ -455,7 +455,7 @@
break;
case
XPathExpression::eNODETYPE_NODE:
-
targetStrings.push_back(PSEUDONAME_ANY);
+
targetStrings.push_back(PSEUDONAME_NODE);
break;
case
XPathExpression::eNODETYPE_ROOT:
@@ -467,7 +467,7 @@
break;
case
XPathExpression::eNODETYPE_PI:
-
targetStrings.push_back(PSEUDONAME_ANY);
+
targetStrings.push_back(PSEUDONAME_PI);
break;
case XPathExpression::eNODENAME:
@@ -1269,6 +1269,7 @@
static XalanDOMString PSEUDONAME_COMMENT;
static XalanDOMString PSEUDONAME_PI;
static XalanDOMString PSEUDONAME_OTHER;
+static XalanDOMString PSEUDONAME_NODE;
@@ -1278,6 +1279,7 @@
const XalanDOMString& XPath::PSEUDONAME_COMMENT =
::PSEUDONAME_COMMENT;
const XalanDOMString& XPath::PSEUDONAME_PI = ::PSEUDONAME_PI;
const XalanDOMString& XPath::PSEUDONAME_OTHER = ::PSEUDONAME_OTHER;
+const XalanDOMString& XPath::PSEUDONAME_NODE = ::PSEUDONAME_NODE;
@@ -1305,6 +1307,7 @@
::PSEUDONAME_COMMENT = XALAN_STATIC_UCODE_STRING("#comment");
::PSEUDONAME_PI = XALAN_STATIC_UCODE_STRING("#pi");
::PSEUDONAME_OTHER = XALAN_STATIC_UCODE_STRING("*");
+ ::PSEUDONAME_NODE = XALAN_STATIC_UCODE_STRING("#node");
}
@@ -1318,6 +1321,7 @@
releaseMemory(::PSEUDONAME_COMMENT);
releaseMemory(::PSEUDONAME_PI);
releaseMemory(::PSEUDONAME_OTHER);
+ releaseMemory(::PSEUDONAME_NODE);
s_functions.DestroyTable();
}
1.25 +1 -0 xml-xalan/c/src/XPath/XPath.hpp
Index: XPath.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XPath.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XPath.hpp 2001/06/14 19:12:09 1.24
+++ XPath.hpp 2001/06/27 18:26:09 1.25
@@ -105,6 +105,7 @@
static const XalanDOMString& PSEUDONAME_COMMENT;
static const XalanDOMString& PSEUDONAME_PI;
static const XalanDOMString& PSEUDONAME_OTHER;
+ static const XalanDOMString& PSEUDONAME_NODE;
#if defined(XALAN_NO_NAMESPACES)
typedef vector<XalanDOMString>
TargetElementStringsVectorType;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
