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:20:12 UTC
cvs commit: xml-xalan/c/src/XSLT FunctionCurrent.cpp FunctionCurrent.hpp FunctionDocument.cpp FunctionDocument.hpp FunctionElementAvailable.cpp FunctionElementAvailable.hpp FunctionFormatNumber.cpp FunctionFormatNumber.hpp FunctionFunctionAvailable.cpp FunctionFunctionAvailable.hpp FunctionGenerateID.cpp FunctionGenerateID.hpp FunctionKey.cpp FunctionKey.hpp FunctionSystemProperty.cpp FunctionSystemProperty.hpp FunctionUnparsedEntityURI.cpp FunctionUnparsedEntityURI.hpp
auriemma 00/12/06 13:20:09
Modified: c/src/XSLT FunctionCurrent.cpp FunctionCurrent.hpp
FunctionDocument.cpp FunctionDocument.hpp
FunctionElementAvailable.cpp
FunctionElementAvailable.hpp
FunctionFormatNumber.cpp FunctionFormatNumber.hpp
FunctionFunctionAvailable.cpp
FunctionFunctionAvailable.hpp
FunctionGenerateID.cpp FunctionGenerateID.hpp
FunctionKey.cpp FunctionKey.hpp
FunctionSystemProperty.cpp
FunctionSystemProperty.hpp
FunctionUnparsedEntityURI.cpp
FunctionUnparsedEntityURI.hpp
Log:
Overloaded all version of execute to avoid warnings on some platforms.
Revision Changes Path
1.10 +56 -0 xml-xalan/c/src/XSLT/FunctionCurrent.cpp
Index: FunctionCurrent.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionCurrent.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionCurrent.cpp 2000/11/21 22:42:39 1.9
+++ FunctionCurrent.cpp 2000/12/06 21:19:16 1.10
@@ -92,6 +92,62 @@
+XObjectPtr
+FunctionCurrent::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCurrent::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCurrent::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionCurrent::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/XSLT/FunctionCurrent.hpp
Index: FunctionCurrent.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionCurrent.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FunctionCurrent.hpp 2000/11/21 21:10:06 1.6
+++ FunctionCurrent.hpp 2000/12/06 21:19:18 1.7
@@ -89,12 +89,40 @@
virtual
~FunctionCurrent();
- // These methods are inherited from XPath/Function ...
+ // 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.22 +56 -15 xml-xalan/c/src/XSLT/FunctionDocument.cpp
Index: FunctionDocument.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FunctionDocument.cpp 2000/12/04 20:48:33 1.21
+++ FunctionDocument.cpp 2000/12/06 21:19:20 1.22
@@ -141,6 +141,45 @@
XObjectPtr
FunctionDocument::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionDocument::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr arg1)
+{
+ assert(arg1.null() == false);
+
+ if (context == 0)
+ {
+ executionContext.error("The document() function requires a non-null context node!",
+ context);
+
+ return XObjectPtr();
+ }
+
+ XalanDOMString base;
+
+ assert(executionContext.getPrefixResolver() != 0);
+
+ base = executionContext.getPrefixResolver()->getURI();
+
+ return execute(executionContext, context, arg1, &base, 1);
+}
+
+
+
+XObjectPtr
+FunctionDocument::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
@@ -201,27 +240,29 @@
XObjectPtr
FunctionDocument::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context,
- const XObjectPtr arg1)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
{
- assert(arg1.null() == false);
+ executionContext.error(getError(), context);
- if (context == 0)
- {
- executionContext.error("The document() function requires a non-null context node!",
- context);
+ return XObjectPtr(0);
+}
- return XObjectPtr();
- }
- XalanDOMString base;
- assert(executionContext.getPrefixResolver() != 0);
-
- base = executionContext.getPrefixResolver()->getURI();
+XObjectPtr
+FunctionDocument::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
- return execute(executionContext, context, arg1, &base, 1);
+ return XObjectPtr(0);
}
1.6 +29 -9 xml-xalan/c/src/XSLT/FunctionDocument.hpp
Index: FunctionDocument.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionDocument.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionDocument.hpp 2000/11/21 21:10:07 1.5
+++ FunctionDocument.hpp 2000/12/06 21:19:21 1.6
@@ -79,20 +79,40 @@
virtual
~FunctionDocument();
- // These methods are inherited from XPath/Function ...
+ // These methods are inherited from Function ...
- virtual XObjectPtr
+ 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,
- 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.11 +55 -0 xml-xalan/c/src/XSLT/FunctionElementAvailable.cpp
Index: FunctionElementAvailable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionElementAvailable.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionElementAvailable.cpp 2000/12/04 20:48:33 1.10
+++ FunctionElementAvailable.cpp 2000/12/06 21:19:22 1.11
@@ -80,6 +80,18 @@
XObjectPtr
FunctionElementAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionElementAvailable::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -112,6 +124,49 @@
return executionContext.getXObjectFactory().createBoolean(executionContext.elementAvailable(theNamespace, elementName));
}
}
+}
+
+
+
+XObjectPtr
+FunctionElementAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionElementAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionElementAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.4 +31 -4 xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp
Index: FunctionElementAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionElementAvailable.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionElementAvailable.hpp 2000/11/21 21:10:08 1.3
+++ FunctionElementAvailable.hpp 2000/12/06 21:19:23 1.4
@@ -89,13 +89,40 @@
virtual
~FunctionElementAvailable();
- // These methods are inherited from XPath/Function ...
+ // 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.10 +39 -0 xml-xalan/c/src/XSLT/FunctionFormatNumber.cpp
Index: FunctionFormatNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFormatNumber.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionFormatNumber.cpp 2000/12/04 20:48:33 1.9
+++ FunctionFormatNumber.cpp 2000/12/06 21:19:25 1.10
@@ -87,6 +87,31 @@
XObjectPtr
FunctionFormatNumber::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFormatNumber::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFormatNumber::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
@@ -152,6 +177,20 @@
theDFS);
return executionContext.getXObjectFactory().createString(theString);
+}
+
+
+
+XObjectPtr
+FunctionFormatNumber::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.8 +29 -11 xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp
Index: FunctionFormatNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFormatNumber.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionFormatNumber.hpp 2000/11/21 21:10:08 1.7
+++ FunctionFormatNumber.hpp 2000/12/06 21:19:26 1.8
@@ -93,22 +93,40 @@
virtual
~FunctionFormatNumber();
- // These methods are inherited from XPath/Function ...
+ // 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);
+
+ 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.10 +55 -0 xml-xalan/c/src/XSLT/FunctionFunctionAvailable.cpp
Index: FunctionFunctionAvailable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFunctionAvailable.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FunctionFunctionAvailable.cpp 2000/12/04 20:48:34 1.9
+++ FunctionFunctionAvailable.cpp 2000/12/06 21:19:28 1.10
@@ -80,6 +80,18 @@
XObjectPtr
FunctionFunctionAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFunctionAvailable::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -98,6 +110,49 @@
const XalanDOMString functionName = indexOfNSSep == nameLength ? fullName : substring(fullName, indexOfNSSep + 1);
return executionContext.getXObjectFactory().createBoolean(executionContext.functionAvailable(theNamespace, functionName));
+}
+
+
+
+XObjectPtr
+FunctionFunctionAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFunctionAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionFunctionAvailable::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.4 +31 -4 xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp
Index: FunctionFunctionAvailable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionFunctionAvailable.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FunctionFunctionAvailable.hpp 2000/11/21 21:10:10 1.3
+++ FunctionFunctionAvailable.hpp 2000/12/06 21:19:30 1.4
@@ -89,13 +89,40 @@
virtual
~FunctionFunctionAvailable();
- // These methods are inherited from XPath/Function ...
+ // 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.11 +64 -21 xml-xalan/c/src/XSLT/FunctionGenerateID.cpp
Index: FunctionGenerateID.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FunctionGenerateID.cpp 2000/12/04 20:48:34 1.10
+++ FunctionGenerateID.cpp 2000/12/06 21:19:32 1.11
@@ -118,6 +118,40 @@
XObjectPtr
FunctionGenerateID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ if (context == 0)
+ {
+ executionContext.error("The function generate-id requires a non-null node!");
+
+ return XObjectPtr();
+ }
+ else
+ {
+ XPathExecutionContext::GetAndReleaseCachedString theGuard(executionContext);
+
+ XalanDOMString& theID = theGuard.get();
+
+#if defined(XALAN_USE_XERCES_DOMSTRING)
+ getSuffix(context, theID);
+ assert(length(theID) != 0);
+
+ return executionContext.getXObjectFactory().createString(m_prefix + theID);
+#else
+ theID = m_prefix;
+
+ getSuffix(context, theID);
+
+ return executionContext.getXObjectFactory().createString(theID);
+#endif
+ }
+}
+
+
+
+XObjectPtr
+FunctionGenerateID::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1)
@@ -140,34 +174,43 @@
XObjectPtr
FunctionGenerateID::execute(
- XPathExecutionContext& executionContext,
- XalanNode* context)
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
{
- if (context == 0)
- {
- executionContext.error("The function generate-id requires a non-null node!");
+ executionContext.error(getError(), context);
- return XObjectPtr();
- }
- else
- {
- XPathExecutionContext::GetAndReleaseCachedString theGuard(executionContext);
+ return XObjectPtr(0);
+}
- XalanDOMString& theID = theGuard.get();
-#if defined(XALAN_USE_XERCES_DOMSTRING)
- getSuffix(context, theID);
- assert(length(theID) != 0);
- return executionContext.getXObjectFactory().createString(m_prefix + theID);
-#else
- theID = m_prefix;
+XObjectPtr
+FunctionGenerateID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
- getSuffix(context, theID);
+ return XObjectPtr(0);
+}
- return executionContext.getXObjectFactory().createString(theID);
-#endif
- }
+
+
+XObjectPtr
+FunctionGenerateID::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.8 +29 -7 xml-xalan/c/src/XSLT/FunctionGenerateID.hpp
Index: FunctionGenerateID.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionGenerateID.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionGenerateID.hpp 2000/11/21 21:10:12 1.7
+++ FunctionGenerateID.hpp 2000/12/06 21:19:33 1.8
@@ -81,18 +81,40 @@
virtual
~FunctionGenerateID();
- // These methods are inherited from XPath/Function ...
+ // These methods are inherited from Function ...
- virtual XObjectPtr
+ 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.19 +54 -0 xml-xalan/c/src/XSLT/FunctionKey.cpp
Index: FunctionKey.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- FunctionKey.cpp 2000/12/04 20:48:34 1.18
+++ FunctionKey.cpp 2000/12/06 21:19:34 1.19
@@ -103,6 +103,31 @@
XObjectPtr
FunctionKey::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionKey::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionKey::execute(
XPathExecutionContext& executionContext,
XalanNode* context,
const XObjectPtr arg1,
@@ -205,6 +230,35 @@
return executionContext.getXObjectFactory().createNodeSet(theNodeRefList);
}
+}
+
+
+
+XObjectPtr
+FunctionKey::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionKey::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.8 +31 -5 xml-xalan/c/src/XSLT/FunctionKey.hpp
Index: FunctionKey.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionKey.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FunctionKey.hpp 2000/11/21 21:10:13 1.7
+++ FunctionKey.hpp 2000/12/06 21:19:35 1.8
@@ -88,14 +88,40 @@
virtual
~FunctionKey();
- // These methods are inherited from XPath/Function ...
+ // 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.16 +55 -0 xml-xalan/c/src/XSLT/FunctionSystemProperty.cpp
Index: FunctionSystemProperty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionSystemProperty.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- FunctionSystemProperty.cpp 2000/12/04 20:48:34 1.15
+++ FunctionSystemProperty.cpp 2000/12/06 21:19:36 1.16
@@ -88,6 +88,18 @@
XObjectPtr
FunctionSystemProperty::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSystemProperty::execute(
XPathExecutionContext& executionContext,
XalanNode* /* context */,
const XObjectPtr arg1)
@@ -153,6 +165,49 @@
{
return executionContext.getXObjectFactory().createString(result);
}
+}
+
+
+
+XObjectPtr
+FunctionSystemProperty::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSystemProperty::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionSystemProperty::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.6 +31 -4 xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp
Index: FunctionSystemProperty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionSystemProperty.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionSystemProperty.hpp 2000/11/21 21:10:14 1.5
+++ FunctionSystemProperty.hpp 2000/12/06 21:19:37 1.6
@@ -79,13 +79,40 @@
virtual
~FunctionSystemProperty();
- // These methods are inherited from XPath/Function ...
+ // 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.12 +54 -0 xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.cpp
Index: FunctionUnparsedEntityURI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FunctionUnparsedEntityURI.cpp 2000/12/04 20:48:34 1.11
+++ FunctionUnparsedEntityURI.cpp 2000/12/06 21:19:38 1.12
@@ -78,7 +78,18 @@
}
+XObjectPtr
+FunctionUnparsedEntityURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
XObjectPtr
FunctionUnparsedEntityURI::execute(
XPathExecutionContext& executionContext,
@@ -110,6 +121,49 @@
const XalanDOMString uri = executionContext.getUnparsedEntityURI(name, *doc);
return executionContext.getXObjectFactory().createString(uri);
+}
+
+
+
+XObjectPtr
+FunctionUnparsedEntityURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionUnparsedEntityURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ const XObjectPtr /* arg1 */,
+ const XObjectPtr /* arg2 */,
+ const XObjectPtr /* arg3 */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
+}
+
+
+
+XObjectPtr
+FunctionUnparsedEntityURI::execute(
+ XPathExecutionContext& executionContext,
+ XalanNode* context,
+ int /* opPos */,
+ const XObjectArgVectorType& /* args */)
+{
+ executionContext.error(getError(), context);
+
+ return XObjectPtr(0);
}
1.6 +32 -5 xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp
Index: FunctionUnparsedEntityURI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/FunctionUnparsedEntityURI.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FunctionUnparsedEntityURI.hpp 2000/11/21 21:10:15 1.5
+++ FunctionUnparsedEntityURI.hpp 2000/12/06 21:19:39 1.6
@@ -86,13 +86,40 @@
virtual
~FunctionUnparsedEntityURI();
- // These methods are inherited from XPath/Function ...
-
+ // 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*