You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by au...@locus.apache.org on 2000/12/06 22:02:44 UTC
cvs commit: xml-xalan/c/src/XPath FunctionBoolean.cpp FunctionBoolean.hpp FunctionCeiling.cpp FunctionCeiling.hpp FunctionConcat.cpp FunctionConcat.hpp FunctionContains.cpp FunctionContains.hpp FunctionCount.cpp FunctionCount.hpp FunctionFalse.cpp FunctionFalse.hpp FunctionFloor.cpp FunctionFloor.hpp FunctionID.cpp FunctionID.hpp FunctionLang.cpp FunctionLang.hpp FunctionLast.cpp FunctionLast.hpp FunctionLocalName.cpp FunctionLocalName.hpp FunctionName.cpp FunctionName.hpp FunctionNamespaceURI.cpp FunctionNamespaceURI.hpp FunctionNormalizeSpace.cpp FunctionNormalizeSpace.hpp FunctionNot.cpp FunctionNot.hpp FunctionNumber.cpp FunctionNumber.hpp FunctionPosition.cpp FunctionPosition.hpp FunctionRound.cpp FunctionRound.hpp FunctionStartsWith.cpp FunctionStartsWith.hpp FunctionString.cpp FunctionString.hpp FunctionStringLength.cpp FunctionStringLength.hpp FunctionSubstring.cpp FunctionSubstring.hpp FunctionSubstringAfter.cpp FunctionSubstringAfter.hpp FunctionSubstringBefore.cpp FunctionSubstringBefore.hpp FunctionSum.cpp FunctionSum.hpp FunctionTranslate.cpp FunctionTranslate.hpp FunctionTrue.cpp FunctionTrue.hpp
auriemma 00/12/06 13:02:41
Modified: c/src/XPath FunctionBoolean.cpp FunctionBoolean.hpp
FunctionCeiling.cpp FunctionCeiling.hpp
FunctionConcat.cpp FunctionConcat.hpp
FunctionContains.cpp FunctionContains.hpp
FunctionCount.cpp FunctionCount.hpp
FunctionFalse.cpp FunctionFalse.hpp
FunctionFloor.cpp FunctionFloor.hpp FunctionID.cpp
FunctionID.hpp FunctionLang.cpp FunctionLang.hpp
FunctionLast.cpp FunctionLast.hpp
FunctionLocalName.cpp FunctionLocalName.hpp
FunctionName.cpp FunctionName.hpp
FunctionNamespaceURI.cpp FunctionNamespaceURI.hpp
FunctionNormalizeSpace.cpp
FunctionNormalizeSpace.hpp FunctionNot.cpp
FunctionNot.hpp FunctionNumber.cpp
FunctionNumber.hpp FunctionPosition.cpp
FunctionPosition.hpp FunctionRound.cpp
FunctionRound.hpp FunctionStartsWith.cpp
FunctionStartsWith.hpp FunctionString.cpp
FunctionString.hpp FunctionStringLength.cpp
FunctionStringLength.hpp FunctionSubstring.cpp
FunctionSubstring.hpp FunctionSubstringAfter.cpp
FunctionSubstringAfter.hpp
FunctionSubstringBefore.cpp
FunctionSubstringBefore.hpp FunctionSum.cpp
FunctionSum.hpp FunctionTranslate.cpp
FunctionTranslate.hpp FunctionTrue.cpp
FunctionTrue.hpp
Log:
Overloaded all version of execute to avoid warnings on some platforms.
Revision Changes Path
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionBoolean.cpp
Index: FunctionBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionBoolean.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionBoolean.cpp 2000/12/04 20:48:13 1.4
+++ FunctionBoolean.cpp 2000/12/06 21:00:02 1.5
@@ -76,6 +76,32 @@
XObjectPtr
FunctionBoolean::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionBoolean::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionBoolean::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -83,6 +109,35 @@
assert(arg1.null() == false);
return executionContext.getXObjectFactory().createBoolean(arg1->boolean());
+}
+
+
+
+XObjectPtr
+FunctionBoolean::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionBoolean::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.7 +30 -3 xml-xalan/c/src/XPath/FunctionBoolean.hpp
Index: FunctionBoolean.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionBoolean.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionBoolean.hpp 2000/11/21 21:07:51 1.6
+++ FunctionBoolean.hpp 2000/12/06 21:00:03 1.7
@@ -83,11 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionCeiling.cpp
Index: FunctionCeiling.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCeiling.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionCeiling.cpp 2000/12/04 20:48:13 1.4
+++ FunctionCeiling.cpp 2000/12/06 21:00:04 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionCeiling::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCeiling::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -83,6 +95,49 @@
assert(arg1.null() == false);
return executionContext.getXObjectFactory().createNumber(ceil(arg1->num()));
+}
+
+
+
+XObjectPtr
+FunctionCeiling::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCeiling::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCeiling::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.7 +31 -4 xml-xalan/c/src/XPath/FunctionCeiling.hpp
Index: FunctionCeiling.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCeiling.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionCeiling.hpp 2000/11/21 21:07:52 1.6
+++ FunctionCeiling.hpp 2000/12/06 21:00:06 1.7
@@ -84,14 +84,41 @@
virtual
~FunctionCeiling();
-
+
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.7 +25 -0 xml-xalan/c/src/XPath/FunctionConcat.cpp
Index: FunctionConcat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionConcat.cpp 2000/12/04 20:48:14 1.6
+++ FunctionConcat.cpp 2000/12/06 21:00:07 1.7
@@ -76,6 +76,31 @@
XObjectPtr
FunctionConcat::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionConcat::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionConcat::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
1.8 +27 -16 xml-xalan/c/src/XPath/FunctionConcat.hpp
Index: FunctionConcat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionConcat.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionConcat.hpp 2000/11/21 21:07:53 1.7
+++ FunctionConcat.hpp 2000/12/06 21:00:09 1.8
@@ -79,31 +79,42 @@
FunctionConcat();
virtual
- ~FunctionConcat();
+ ~FunctionConcat();
// These methods are inherited from Function ...
- virtual XObjectPtr
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
virtual XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1,
- const XObjectPtr arg2,
- const XObjectPtr arg3);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
- virtual XObjectPtr
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- int /* opPos */,
- const XObjectArgVectorType& args);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +54 -0 xml-xalan/c/src/XPath/FunctionContains.cpp
Index: FunctionContains.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionContains.cpp 2000/12/04 20:48:15 1.4
+++ FunctionContains.cpp 2000/12/06 21:00:11 1.5
@@ -76,6 +76,31 @@
XObjectPtr
FunctionContains::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionContains::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionContains::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -107,6 +132,35 @@
}
return executionContext.getXObjectFactory().createBoolean(fResult);
+}
+
+
+
+XObjectPtr
+FunctionContains::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionContains::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +30 -4 xml-xalan/c/src/XPath/FunctionContains.hpp
Index: FunctionContains.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionContains.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionContains.hpp 2000/11/21 21:07:55 1.9
+++ FunctionContains.hpp 2000/12/06 21:00:11 1.10
@@ -83,12 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionCount.cpp
Index: FunctionCount.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCount.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionCount.cpp 2000/12/04 20:48:15 1.4
+++ FunctionCount.cpp 2000/12/06 21:00:14 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionCount::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCount::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -85,6 +97,49 @@
const NodeRefListBase& theNodeList = arg1->nodeset();
return executionContext.getXObjectFactory().createNumber(theNodeList.getLength());
+}
+
+
+
+XObjectPtr
+FunctionCount::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCount::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCount::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.8 +30 -3 xml-xalan/c/src/XPath/FunctionCount.hpp
Index: FunctionCount.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionCount.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionCount.hpp 2000/11/30 17:06:53 1.7
+++ FunctionCount.hpp 2000/12/06 21:00:15 1.8
@@ -83,11 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +56 -0 xml-xalan/c/src/XPath/FunctionFalse.cpp
Index: FunctionFalse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFalse.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionFalse.cpp 2000/12/04 20:48:15 1.4
+++ FunctionFalse.cpp 2000/12/06 21:00:16 1.5
@@ -84,6 +84,62 @@
+XObjectPtr
+FunctionFalse::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFalse::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFalse::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFalse::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
Function*
#else
1.7 +31 -3 xml-xalan/c/src/XPath/FunctionFalse.hpp
Index: FunctionFalse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFalse.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionFalse.hpp 2000/11/21 21:07:57 1.6
+++ FunctionFalse.hpp 2000/12/06 21:00:20 1.7
@@ -79,14 +79,42 @@
FunctionFalse();
virtual
- ~FunctionFalse();
+ ~FunctionFalse();
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionFloor.cpp
Index: FunctionFloor.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFloor.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionFloor.cpp 2000/12/04 20:48:15 1.4
+++ FunctionFloor.cpp 2000/12/06 21:00:21 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionFloor::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFloor::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -83,6 +95,49 @@
assert(arg1.null() == false);
return executionContext.getXObjectFactory().createNumber(floor(arg1->num()));
+}
+
+
+
+XObjectPtr
+FunctionFloor::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFloor::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFloor::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.7 +30 -3 xml-xalan/c/src/XPath/FunctionFloor.hpp
Index: FunctionFloor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionFloor.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionFloor.hpp 2000/11/21 21:07:58 1.6
+++ FunctionFloor.hpp 2000/12/06 21:00:22 1.7
@@ -87,11 +87,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionID.cpp
Index: FunctionID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionID.cpp 2000/12/04 20:48:15 1.4
+++ FunctionID.cpp 2000/12/06 21:00:23 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionID::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1)
@@ -158,6 +170,49 @@
}
return executionContext.getXObjectFactory().createNodeSet(theNodeList);
+}
+
+
+
+XObjectPtr
+FunctionID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.19 +30 -3 xml-xalan/c/src/XPath/FunctionID.hpp
Index: FunctionID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionID.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FunctionID.hpp 2000/11/21 21:07:59 1.18
+++ FunctionID.hpp 2000/12/06 21:00:24 1.19
@@ -104,11 +104,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionLang.cpp
Index: FunctionLang.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionLang.cpp 2000/12/04 20:48:15 1.4
+++ FunctionLang.cpp 2000/12/06 21:00:25 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionLang::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLang::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1)
@@ -124,6 +136,49 @@
}
return executionContext.getXObjectFactory().createBoolean(fMatch);
+}
+
+
+
+XObjectPtr
+FunctionLang::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLang::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLang::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.12 +30 -3 xml-xalan/c/src/XPath/FunctionLang.hpp
Index: FunctionLang.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLang.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionLang.hpp 2000/11/21 21:08:00 1.11
+++ FunctionLang.hpp 2000/12/06 21:00:26 1.12
@@ -88,11 +88,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +56 -0 xml-xalan/c/src/XPath/FunctionLast.cpp
Index: FunctionLast.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionLast.cpp 2000/12/04 20:48:15 1.4
+++ FunctionLast.cpp 2000/12/06 21:00:27 1.5
@@ -86,6 +86,62 @@
+XObjectPtr
+FunctionLast::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLast::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLast::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLast::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
Function*
#else
1.7 +30 -2 xml-xalan/c/src/XPath/FunctionLast.hpp
Index: FunctionLast.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLast.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionLast.hpp 2000/11/21 21:08:01 1.6
+++ FunctionLast.hpp 2000/12/06 21:00:29 1.7
@@ -84,10 +84,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.7 +54 -11 xml-xalan/c/src/XPath/FunctionLocalName.cpp
Index: FunctionLocalName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLocalName.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionLocalName.cpp 2000/12/04 20:48:15 1.6
+++ FunctionLocalName.cpp 2000/12/06 21:00:29 1.7
@@ -77,6 +77,25 @@
XObjectPtr
FunctionLocalName::execute(
XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ if (context == 0)
+ {
+ executionContext.error("The local-name() function requires a non-null context node!");
+
+ return XObjectPtr();
+ }
+ else
+ {
+ return getLocalName(executionContext, *context);
+ }
+}
+
+
+
+XObjectPtr
+FunctionLocalName::execute(
+ XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1)
{
@@ -99,19 +118,43 @@
XObjectPtr
FunctionLocalName::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
{
- if (context == 0)
- {
- executionContext.error("The local-name() function requires a non-null context node!");
+ executionContext.error(getError(), context);
- return XObjectPtr();
- }
- else
- {
- return getLocalName(executionContext, *context);
- }
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLocalName::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionLocalName::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.13 +28 -6 xml-xalan/c/src/XPath/FunctionLocalName.hpp
Index: FunctionLocalName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionLocalName.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionLocalName.hpp 2000/11/21 21:08:02 1.12
+++ FunctionLocalName.hpp 2000/12/06 21:00:31 1.13
@@ -97,14 +97,36 @@
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
-
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -12 xml-xalan/c/src/XPath/FunctionName.cpp
Index: FunctionName.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionName.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionName.cpp 2000/12/04 20:48:15 1.4
+++ FunctionName.cpp 2000/12/06 21:00:33 1.5
@@ -77,6 +77,27 @@
XObjectPtr
FunctionName::execute(
XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ XalanDOMString theData;
+
+ if (context == 0)
+ {
+ executionContext.error("The name() function requires a non-null context node!");
+ }
+ else
+ {
+ theData = executionContext.getNameOfNode(*context);
+ }
+
+ return executionContext.getXObjectFactory().createString(theData);
+}
+
+
+
+XObjectPtr
+FunctionName::execute(
+ XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
{
@@ -99,21 +120,43 @@
XObjectPtr
FunctionName::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
{
- XalanDOMString theData;
+ executionContext.error(getError(), context);
- if (context == 0)
- {
- executionContext.error("The name() function requires a non-null context node!");
- }
- else
- {
- theData = executionContext.getNameOfNode(*context);
- }
+ return XObjectPtr(0);
+}
- return executionContext.getXObjectFactory().createString(theData);
+
+
+XObjectPtr
+FunctionName::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionName::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +28 -6 xml-xalan/c/src/XPath/FunctionName.hpp
Index: FunctionName.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionName.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionName.hpp 2000/11/21 21:08:03 1.9
+++ FunctionName.hpp 2000/12/06 21:00:33 1.10
@@ -101,14 +101,36 @@
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
-
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.6 +58 -15 xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp
Index: FunctionNamespaceURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionNamespaceURI.cpp 2000/12/04 20:48:15 1.5
+++ FunctionNamespaceURI.cpp 2000/12/06 21:00:34 1.6
@@ -77,6 +77,29 @@
XObjectPtr
FunctionNamespaceURI::execute(
XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ if (context == 0)
+ {
+ executionContext.error("The namespace-uri() function requires a non-null context node!");
+
+ // Dummy return value...
+ return XObjectPtr(0);
+ }
+ else
+ {
+ // The XPath standard says that if there are no arguments,
+ // the argument defaults to a node set with the context node
+ // as the only member.
+ return executionContext.getXObjectFactory().createString(executionContext.getNamespaceOfNode(*context));
+ }
+}
+
+
+
+XObjectPtr
+FunctionNamespaceURI::execute(
+ XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
{
@@ -100,23 +123,43 @@
XObjectPtr
FunctionNamespaceURI::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
{
- if (context == 0)
- {
- executionContext.error("The namespace-uri() function requires a non-null context node!");
+ executionContext.error(getError(), context);
- // Dummy return value...
- return XObjectPtr(0);
- }
- else
- {
- // The XPath standard says that if there are no arguments,
- // the argument defaults to a node set with the context node
- // as the only member.
- return executionContext.getXObjectFactory().createString(executionContext.getNamespaceOfNode(*context));
- }
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNamespaceURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNamespaceURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.13 +30 -7 xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp
Index: FunctionNamespaceURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNamespaceURI.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FunctionNamespaceURI.hpp 2000/12/04 20:48:15 1.12
+++ FunctionNamespaceURI.hpp 2000/12/06 21:00:36 1.13
@@ -83,23 +83,46 @@
class XALAN_XPATH_EXPORT FunctionNamespaceURI : public Function
{
public:
-
- // These methods are inherited from Function ...
+
FunctionNamespaceURI();
virtual
~FunctionNamespaceURI();
+ // These methods are inherited from Function ...
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.9 +56 -13 xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp
Index: FunctionNormalizeSpace.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionNormalizeSpace.cpp 2000/12/04 20:48:16 1.8
+++ FunctionNormalizeSpace.cpp 2000/12/06 21:00:37 1.9
@@ -82,19 +82,6 @@
XObjectPtr
FunctionNormalizeSpace::execute(
XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1)
-{
- assert(arg1.null() == false);
-
- return normalize(executionContext, arg1);
-}
-
-
-
-XObjectPtr
-FunctionNormalizeSpace::execute(
- XPathExecutionContext& executionContext,
XalanNode* context)
{
if (context == 0)
@@ -118,6 +105,62 @@
return normalize(executionContext, theData);
}
+}
+
+
+
+XObjectPtr
+FunctionNormalizeSpace::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* /* context */,
+ const XObjectPtr arg1)
+{
+ assert(arg1.null() == false);
+
+ return normalize(executionContext, arg1);
+}
+
+
+
+XObjectPtr
+FunctionNormalizeSpace::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNormalizeSpace::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNormalizeSpace::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.6 +30 -7 xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp
Index: FunctionNormalizeSpace.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNormalizeSpace.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionNormalizeSpace.hpp 2000/12/01 21:40:55 1.5
+++ FunctionNormalizeSpace.hpp 2000/12/06 21:00:38 1.6
@@ -79,23 +79,46 @@
class XALAN_XPATH_EXPORT FunctionNormalizeSpace : public Function
{
public:
-
- // These methods are inherited from Function ...
+
FunctionNormalizeSpace();
virtual
~FunctionNormalizeSpace();
+ // These methods are inherited from Function ...
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionNot.cpp
Index: FunctionNot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNot.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionNot.cpp 2000/12/04 20:48:16 1.4
+++ FunctionNot.cpp 2000/12/06 21:00:39 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionNot::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNot::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -83,6 +95,49 @@
assert(arg1.null() == false);
return executionContext.getXObjectFactory().createBoolean(!arg1->boolean());
+}
+
+
+
+XObjectPtr
+FunctionNot::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNot::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNot::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.7 +30 -3 xml-xalan/c/src/XPath/FunctionNot.hpp
Index: FunctionNot.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNot.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionNot.hpp 2000/11/21 21:08:06 1.6
+++ FunctionNot.hpp 2000/12/06 21:00:40 1.7
@@ -83,11 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +63 -20 xml-xalan/c/src/XPath/FunctionNumber.cpp
Index: FunctionNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNumber.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionNumber.cpp 2000/12/04 20:48:16 1.4
+++ FunctionNumber.cpp 2000/12/06 21:00:41 1.5
@@ -81,6 +81,37 @@
XObjectPtr
FunctionNumber::execute(
XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ if (context == 0)
+ {
+ executionContext.error("The number() function requires a non-null context node!");
+
+ // Dummy return value...
+ return XObjectPtr(0);
+ }
+ else
+ {
+ // The XPath standard says that if there are no arguments,
+ // the argument defaults to a node set with the context node
+ // as the only member. The number value of a node set is the
+ // string value of the first node in the node set, converted to
+ // a number. DOMServices::getNodeData() will give us the data.
+
+ // Get a cached string...
+ XPathExecutionContext::GetAndReleaseCachedString theData(executionContext);
+
+ DOMServices::getNodeData(*context, theData);
+
+ return executionContext.getXObjectFactory().createNumber(DOMStringToDouble(theData));
+ }
+}
+
+
+
+XObjectPtr
+FunctionNumber::execute(
+ XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
{
@@ -102,31 +133,43 @@
XObjectPtr
FunctionNumber::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
{
- if (context == 0)
- {
- executionContext.error("The number() function requires a non-null context node!");
+ executionContext.error(getError(), context);
- // Dummy return value...
- return XObjectPtr(0);
- }
- else
- {
- // The XPath standard says that if there are no arguments,
- // the argument defaults to a node set with the context node
- // as the only member. The number value of a node set is the
- // string value of the first node in the node set, converted to
- // a number. DOMServices::getNodeData() will give us the data.
+ return XObjectPtr(0);
+}
- // Get a cached string...
- XPathExecutionContext::GetAndReleaseCachedString theData(executionContext);
- DOMServices::getNodeData(*context, theData);
- return executionContext.getXObjectFactory().createNumber(DOMStringToDouble(theData));
- }
+XObjectPtr
+FunctionNumber::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionNumber::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +30 -7 xml-xalan/c/src/XPath/FunctionNumber.hpp
Index: FunctionNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionNumber.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionNumber.hpp 2000/11/30 21:36:33 1.9
+++ FunctionNumber.hpp 2000/12/06 21:00:43 1.10
@@ -79,23 +79,46 @@
class XALAN_XPATH_EXPORT FunctionNumber : public Function
{
public:
-
- // These methods are inherited from Function ...
+
FunctionNumber();
virtual
~FunctionNumber();
+ // These methods are inherited from Function ...
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +56 -0 xml-xalan/c/src/XPath/FunctionPosition.cpp
Index: FunctionPosition.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionPosition.cpp 2000/12/04 20:48:16 1.4
+++ FunctionPosition.cpp 2000/12/06 21:00:44 1.5
@@ -92,6 +92,62 @@
+XObjectPtr
+FunctionPosition::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionPosition::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionPosition::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionPosition::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
Function*
#else
1.7 +30 -2 xml-xalan/c/src/XPath/FunctionPosition.hpp
Index: FunctionPosition.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionPosition.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionPosition.hpp 2000/11/21 21:08:08 1.6
+++ FunctionPosition.hpp 2000/12/06 21:00:45 1.7
@@ -83,10 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionRound.cpp
Index: FunctionRound.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionRound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionRound.cpp 2000/12/04 20:48:16 1.4
+++ FunctionRound.cpp 2000/12/06 21:00:46 1.5
@@ -80,6 +80,18 @@
XObjectPtr
FunctionRound::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionRound::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -88,6 +100,49 @@
return executionContext.getXObjectFactory().createNumber(
getRoundedValue(arg1->num()));
+}
+
+
+
+XObjectPtr
+FunctionRound::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionRound::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionRound::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.9 +30 -3 xml-xalan/c/src/XPath/FunctionRound.hpp
Index: FunctionRound.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionRound.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionRound.hpp 2000/11/21 21:08:08 1.8
+++ FunctionRound.hpp 2000/12/06 21:00:47 1.9
@@ -87,11 +87,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +54 -0 xml-xalan/c/src/XPath/FunctionStartsWith.cpp
Index: FunctionStartsWith.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionStartsWith.cpp 2000/12/04 20:48:16 1.4
+++ FunctionStartsWith.cpp 2000/12/06 21:00:49 1.5
@@ -76,6 +76,31 @@
XObjectPtr
FunctionStartsWith::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionStartsWith::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionStartsWith::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -87,6 +112,35 @@
arg2->str());
return executionContext.getXObjectFactory().createBoolean(fStartsWith);
+}
+
+
+
+XObjectPtr
+FunctionStartsWith::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionStartsWith::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.7 +30 -4 xml-xalan/c/src/XPath/FunctionStartsWith.hpp
Index: FunctionStartsWith.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStartsWith.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionStartsWith.hpp 2000/11/21 21:08:14 1.6
+++ FunctionStartsWith.hpp 2000/12/06 21:00:51 1.7
@@ -83,12 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.7 +56 -13 xml-xalan/c/src/XPath/FunctionString.cpp
Index: FunctionString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionString.cpp 2000/12/04 20:48:16 1.6
+++ FunctionString.cpp 2000/12/06 21:00:52 1.7
@@ -81,19 +81,6 @@
XObjectPtr
FunctionString::execute(
XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1)
-{
- assert(arg1.null() == false);
-
- return executionContext.getXObjectFactory().createString(arg1->str());
-}
-
-
-
-XObjectPtr
-FunctionString::execute(
- XPathExecutionContext& executionContext,
XalanNode* context)
{
if (context == 0)
@@ -118,6 +105,62 @@
return executionContext.getXObjectFactory().createString(theData);
}
+}
+
+
+
+XObjectPtr
+FunctionString::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* /* context */,
+ const XObjectPtr arg1)
+{
+ assert(arg1.null() == false);
+
+ return executionContext.getXObjectFactory().createString(arg1->str());
+}
+
+
+
+XObjectPtr
+FunctionString::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionString::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionString::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.11 +29 -6 xml-xalan/c/src/XPath/FunctionString.hpp
Index: FunctionString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionString.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionString.hpp 2000/11/30 21:36:36 1.10
+++ FunctionString.hpp 2000/12/06 21:00:54 1.11
@@ -84,22 +84,45 @@
{
public:
- // These methods are inherited from Function ...
FunctionString();
virtual
~FunctionString();
+ // These methods are inherited from Function ...
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +56 -13 xml-xalan/c/src/XPath/FunctionStringLength.cpp
Index: FunctionStringLength.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionStringLength.cpp 2000/12/04 20:48:16 1.4
+++ FunctionStringLength.cpp 2000/12/06 21:00:55 1.5
@@ -81,19 +81,6 @@
XObjectPtr
FunctionStringLength::execute(
XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1)
-{
- assert(arg1.null() == false);
-
- return executionContext.getXObjectFactory().createNumber(length(arg1->str()));
-}
-
-
-
-XObjectPtr
-FunctionStringLength::execute(
- XPathExecutionContext& executionContext,
XalanNode* context)
{
if (context == 0)
@@ -118,6 +105,62 @@
return executionContext.getXObjectFactory().createNumber(length(theData));
}
+}
+
+
+
+XObjectPtr
+FunctionStringLength::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* /* context */,
+ const XObjectPtr arg1)
+{
+ assert(arg1.null() == false);
+
+ return executionContext.getXObjectFactory().createNumber(length(arg1->str()));
+}
+
+
+
+XObjectPtr
+FunctionStringLength::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionStringLength::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionStringLength::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +29 -6 xml-xalan/c/src/XPath/FunctionStringLength.hpp
Index: FunctionStringLength.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionStringLength.hpp 2000/11/30 21:36:36 1.9
+++ FunctionStringLength.hpp 2000/12/06 21:00:56 1.10
@@ -80,22 +80,45 @@
{
public:
- // These methods are inherited from Function ...
FunctionStringLength();
virtual
~FunctionStringLength();
+ // These methods are inherited from Function ...
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
+ virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.9 +45 -6 xml-xalan/c/src/XPath/FunctionSubstring.cpp
Index: FunctionSubstring.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionSubstring.cpp 2000/12/05 19:25:12 1.8
+++ FunctionSubstring.cpp 2000/12/06 21:00:57 1.9
@@ -165,6 +165,45 @@
XObjectPtr
FunctionSubstring::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstring::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstring::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1,
+ const XObjectPtr arg2)
+{
+ assert(arg1.null() == false && arg2.null() == false);
+
+ return execute(executionContext, context, arg1, arg2, XObjectPtr());
+}
+
+
+
+XObjectPtr
+FunctionSubstring::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -225,14 +264,14 @@
XObjectPtr
FunctionSubstring::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
{
- assert(arg1.null() == false && arg2.null() == false);
+ executionContext.error(getError(), context);
- return execute(executionContext, context, arg1, arg2, XObjectPtr());
+ return XObjectPtr(0);
}
1.10 +27 -10 xml-xalan/c/src/XPath/FunctionSubstring.hpp
Index: FunctionSubstring.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstring.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionSubstring.hpp 2000/11/21 21:08:16 1.9
+++ FunctionSubstring.hpp 2000/12/06 21:00:57 1.10
@@ -95,21 +95,38 @@
// These methods are inherited from Function ...
- virtual XObjectPtr
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2,
- const XObjectPtr arg3);
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.8 +54 -0 xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp
Index: FunctionSubstringAfter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionSubstringAfter.cpp 2000/12/04 20:48:17 1.7
+++ FunctionSubstringAfter.cpp 2000/12/06 21:00:59 1.8
@@ -76,6 +76,31 @@
XObjectPtr
FunctionSubstringAfter::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringAfter::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringAfter::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -119,6 +144,35 @@
return executionContext.getXObjectFactory().createString(theFirstCharacter, theSubstringLength);
}
}
+}
+
+
+
+XObjectPtr
+FunctionSubstringAfter::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringAfter::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.9 +30 -4 xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp
Index: FunctionSubstringAfter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringAfter.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionSubstringAfter.hpp 2000/11/21 21:08:17 1.8
+++ FunctionSubstringAfter.hpp 2000/12/06 21:01:00 1.9
@@ -83,12 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.8 +54 -0 xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp
Index: FunctionSubstringBefore.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionSubstringBefore.cpp 2000/12/04 20:48:17 1.7
+++ FunctionSubstringBefore.cpp 2000/12/06 21:01:01 1.8
@@ -76,6 +76,31 @@
XObjectPtr
FunctionSubstringBefore::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringBefore::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringBefore::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -110,6 +135,35 @@
theIndex);
}
}
+}
+
+
+
+XObjectPtr
+FunctionSubstringBefore::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSubstringBefore::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.9 +30 -4 xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp
Index: FunctionSubstringBefore.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSubstringBefore.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionSubstringBefore.hpp 2000/11/21 21:08:17 1.8
+++ FunctionSubstringBefore.hpp 2000/12/06 21:01:02 1.9
@@ -83,12 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1,
- const XObjectPtr arg2);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +55 -0 xml-xalan/c/src/XPath/FunctionSum.cpp
Index: FunctionSum.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionSum.cpp 2000/12/04 20:48:17 1.4
+++ FunctionSum.cpp 2000/12/06 21:01:05 1.5
@@ -76,6 +76,18 @@
XObjectPtr
FunctionSum::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSum::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -98,6 +110,49 @@
}
return executionContext.getXObjectFactory().createNumber(sum);
+}
+
+
+
+XObjectPtr
+FunctionSum::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSum::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSum::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +30 -3 xml-xalan/c/src/XPath/FunctionSum.hpp
Index: FunctionSum.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionSum.hpp 2000/11/21 21:08:19 1.9
+++ FunctionSum.hpp 2000/12/06 21:01:06 1.10
@@ -88,11 +88,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.8 +53 -0 xml-xalan/c/src/XPath/FunctionTranslate.cpp
Index: FunctionTranslate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionTranslate.cpp 2000/12/04 20:48:17 1.7
+++ FunctionTranslate.cpp 2000/12/06 21:01:07 1.8
@@ -76,6 +76,45 @@
XObjectPtr
FunctionTranslate::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTranslate::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTranslate::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTranslate::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1,
@@ -145,6 +184,20 @@
{
return executionContext.getXObjectFactory().createString(&*theBuffer.begin(), theSize);
}
+}
+
+
+
+XObjectPtr
+FunctionTranslate::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.10 +30 -5 xml-xalan/c/src/XPath/FunctionTranslate.hpp
Index: FunctionTranslate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTranslate.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionTranslate.hpp 2000/11/21 21:08:19 1.9
+++ FunctionTranslate.hpp 2000/12/06 21:01:08 1.10
@@ -83,13 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* /* context */,
- const XObjectPtr arg1,
- const XObjectPtr arg2,
- const XObjectPtr arg3);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*
1.5 +56 -0 xml-xalan/c/src/XPath/FunctionTrue.cpp
Index: FunctionTrue.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTrue.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FunctionTrue.cpp 2000/12/04 20:48:17 1.4
+++ FunctionTrue.cpp 2000/12/06 21:01:09 1.5
@@ -84,6 +84,62 @@
+XObjectPtr
+FunctionTrue::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTrue::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTrue::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionTrue::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
Function*
#else
1.7 +30 -2 xml-xalan/c/src/XPath/FunctionTrue.hpp
Index: FunctionTrue.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionTrue.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionTrue.hpp 2000/11/21 21:08:20 1.6
+++ FunctionTrue.hpp 2000/12/06 21:01:10 1.7
@@ -83,10 +83,38 @@
// These methods are inherited from Function ...
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context);
+
virtual XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */);
+
+ XObjectPtr
+ execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */);
+
+ XObjectPtr
execute(
- XPathExecutionContext& executionContext,
- XalanNode* context);
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */);
#if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
virtual Function*