dbertoni 2002/11/02 19:36:25
Modified: c/src/XSLT ProblemListener.hpp ProblemListenerDefault.cpp
ProblemListenerDefault.hpp TraceListenerDefault.cpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
XSLTProcessor.hpp XSLTProcessorEnvSupport.hpp
XSLTProcessorEnvSupportDefault.cpp
XSLTProcessorEnvSupportDefault.hpp
Log:
Straightened out reporting overloads related to stylesheet nodes.
Revision Changes Path
1.6 +9 -9 xml-xalan/c/src/XSLT/ProblemListener.hpp
Index: ProblemListener.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListener.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProblemListener.hpp 18 Jul 2001 04:33:15 -0000 1.5
+++ ProblemListener.hpp 3 Nov 2002 03:36:25 -0000 1.6
@@ -129,14 +129,14 @@
*/
virtual void
problem(
- eProblemSource where,
- eClassification classification,
- const XalanNode* sourceNode,
- const XalanNode* styleNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset) =
0;
+ eProblemSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset) = 0;
};
1.10 +17 -17 xml-xalan/c/src/XSLT/ProblemListenerDefault.cpp
Index: ProblemListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListenerDefault.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ProblemListenerDefault.cpp 5 Apr 2002 03:45:19 -0000 1.9
+++ ProblemListenerDefault.cpp 3 Nov 2002 03:36:25 -0000 1.10
@@ -121,14 +121,14 @@
void
ProblemListenerDefault::problem(
- eProblemSource where,
- eClassification classification,
- const XalanNode* sourceNode,
- const XalanNode* styleNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset)
+ eProblemSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset)
{
if (m_pw != 0)
{
@@ -140,15 +140,15 @@
void
ProblemListenerDefault::problem(
- PrintWriter& pw,
- eProblemSource where,
- eClassification classification,
- const XalanNode* sourceNode,
- const XalanNode* styleNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset)
+ PrintWriter& pw,
+ eProblemSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset)
{
if (eXMLPARSER == where)
{
1.7 +17 -17 xml-xalan/c/src/XSLT/ProblemListenerDefault.hpp
Index: ProblemListenerDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ProblemListenerDefault.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProblemListenerDefault.hpp 4 Apr 2002 06:21:10 -0000 1.6
+++ ProblemListenerDefault.hpp 3 Nov 2002 03:36:25 -0000 1.7
@@ -88,14 +88,14 @@
virtual void
problem(
- eProblemSource where,
- eClassification classification,
- const XalanNode* sourceNode,
- const XalanNode* styleNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset);
+ eProblemSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset);
// These methods are new...
@@ -107,15 +107,15 @@
static void
problem(
- PrintWriter& pw,
- eProblemSource where,
- eClassification classification,
- const XalanNode* sourceNode,
- const XalanNode* styleNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset);
+ PrintWriter& pw,
+ eProblemSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset);
private:
1.13 +1 -1 xml-xalan/c/src/XSLT/TraceListenerDefault.cpp
Index: TraceListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/TraceListenerDefault.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TraceListenerDefault.cpp 24 Sep 2002 01:42:35 -0000 1.12
+++ TraceListenerDefault.cpp 3 Nov 2002 03:36:25 -0000 1.13
@@ -161,7 +161,7 @@
m_printWriter.print(XALAN_STATIC_UCODE_STRING("\" "));
}
- const XalanQName& theName = et.getName();
+ const XalanQName& theName = et.getNameAttribute();
if(theName.isEmpty() == false)
{
1.162 +3 -128 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- XSLTEngineImpl.cpp 31 Oct 2002 07:15:56 -0000 1.161
+++ XSLTEngineImpl.cpp 3 Nov 2002 03:36:25 -0000 1.162
@@ -263,7 +263,7 @@
if (0 == stylesheetSource.getSystemId())
{
- xslIdentifier = XalanDOMString(XALAN_STATIC_UCODE_STRING("Input XSL"));
+ xslIdentifier = XALAN_STATIC_UCODE_STRING("Input XSL");
}
else
{
@@ -367,7 +367,7 @@
if(0 == m_stylesheetRoot)
{
- error("Failed to process stylesheet!");
+ error(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("Failed to
process stylesheet!")));
}
else if(0 != sourceTree)
{
@@ -416,7 +416,7 @@
{
if (m_stylesheetRoot == 0)
{
- error("No stylesheet is available to process!");
+ error(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("No
stylesheet is available to process!")));
}
FormatterListener* const theFormatter =
@@ -1058,17 +1058,6 @@
void
XSLTEngineImpl::message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- problem(msg, ProblemListener::eMESSAGE, sourceNode, styleNode);
-}
-
-
-
-void
-XSLTEngineImpl::message(
const XalanDOMString& msg,
const XalanNode* sourceNode,
const ElemTemplateElement* styleNode) const
@@ -1090,72 +1079,6 @@
void
-XSLTEngineImpl::message(
- const char* msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- message(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-XSLTEngineImpl::problem(
- const XalanDOMString& msg,
- ProblemListener::eClassification classification,
- const XalanNode*
sourceNode,
- const XalanNode*
styleNode) const
-{
- const Locator* const locator = getLocatorFromStack();
-
- const XalanDOMChar* id = 0;
-
- XalanDOMString uri;
-
- XalanLocator::size_type lineNumber = -1;
- XalanLocator::size_type columnNumber = -1;
-
- if (locator != 0)
- {
- id = locator->getPublicId();
-
- if (id == 0)
- {
- id = locator->getSystemId();
- }
-
- if (id != 0)
- {
- uri = id;
- }
-
- lineNumber = locator->getLineNumber();
- columnNumber = locator->getColumnNumber();
- }
-
- if (m_problemListener != 0)
- {
- m_problemListener->problem(
- ProblemListener::eXSLPROCESSOR,
- classification,
- sourceNode,
- styleNode,
- msg,
- id,
- lineNumber,
- columnNumber);
- }
-
- if (classification == ProblemListener::eERROR)
- {
- throw XSLTProcessorException(msg, uri, lineNumber, columnNumber);
- }
-}
-
-
-
-void
XSLTEngineImpl::problem(
const XalanDOMString& msg,
ProblemListener::eClassification classification,
@@ -1264,17 +1187,6 @@
void
XSLTEngineImpl::warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- problem(msg, ProblemListener::eWARNING, sourceNode, styleNode);
-}
-
-
-
-void
-XSLTEngineImpl::warn(
const XalanDOMString& msg,
const XalanNode* sourceNode,
const ElemTemplateElement* styleNode) const
@@ -1306,17 +1218,6 @@
void
XSLTEngineImpl::warn(
- const char* msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- warn(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
-XSLTEngineImpl::warn(
const char* msg,
const XalanNode* sourceNode,
const ElemTemplateElement* styleNode) const
@@ -1328,17 +1229,6 @@
void
XSLTEngineImpl::error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- problem(msg, ProblemListener::eERROR, sourceNode, styleNode);
-}
-
-
-
-void
-XSLTEngineImpl::error(
const XalanDOMString& msg,
const XalanNode* sourceNode,
const ElemTemplateElement* styleNode) const
@@ -1360,17 +1250,6 @@
void
-XSLTEngineImpl::error(
- const char* msg,
- const XalanNode* sourceNode,
- const XalanNode* styleNode) const
-{
- error(TranscodeFromLocalCodePage(msg), sourceNode, styleNode);
-}
-
-
-
-void
XSLTEngineImpl::pushTime(const void* key)
{
if(0 != key)
@@ -2394,10 +2273,6 @@
comment(c_wstr(node.getNodeValue()));
break;
- case XalanNode::DOCUMENT_FRAGMENT_NODE:
- error("No clone of a document fragment!");
- break;
-
case XalanNode::ENTITY_REFERENCE_NODE:
entityReference(c_wstr(node.getNodeName()));
break;
1.101 +16 -66 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- XSLTEngineImpl.hpp 31 Oct 2002 07:15:56 -0000 1.100
+++ XSLTEngineImpl.hpp 3 Nov 2002 03:36:25 -0000 1.101
@@ -110,7 +110,6 @@
-#include "KeyDeclaration.hpp"
#include "OutputContextStack.hpp"
#include "ProblemListenerDefault.hpp"
#include "ResultNamespacesStack.hpp"
@@ -812,28 +811,9 @@
virtual void
message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- message(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const;
-
- /**
- * Report a message
- *
- * @param msg text of message to output
- * @param sourceNode node in source where error occurred
- * @param styleNode node in stylesheet where error occurred
- */
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const;
virtual void
message(
@@ -843,27 +823,22 @@
virtual void
warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- warn(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const;
+ /**
+ * Report a message
+ *
+ * @param msg text of message to output
+ * @param sourceNode node in source where error occurred
+ * @param styleNode node in stylesheet where error occurred
+ */
virtual void
warn(
const char* msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const;
virtual void
warn(
@@ -873,15 +848,9 @@
virtual void
error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
-
- virtual void
- error(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const;
virtual void
error(
@@ -889,18 +858,7 @@
const Locator& locator,
const XalanNode* sourceNode = 0) const;
- /**
- * Report an error, and throw an exception.
- *
- * @param msg text of message to output
- * @param sourceNode node in source where error occurred
- * @param styleNode node in stylesheet where error occurred
- */
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const;
+public:
/**
* Mark the time, so that displayDuration can later display the elapsed
@@ -1603,14 +1561,6 @@
*/
TraceListenerVectorType m_traceListeners;
- // Common processing for errors and warnings
- void
- problem(
- const XalanDOMString& msg,
- ProblemListener::eClassification classification,
- const XalanNode*
sourceNode,
- const XalanNode*
styleNode) const;
-
void
problem(
const XalanDOMString& msg,
1.31 +6 -44 xml-xalan/c/src/XSLT/XSLTProcessor.hpp
Index: XSLTProcessor.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessor.hpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XSLTProcessor.hpp 27 Sep 2002 23:31:38 -0000 1.30
+++ XSLTProcessor.hpp 3 Nov 2002 03:36:25 -0000 1.31
@@ -420,22 +420,9 @@
*/
virtual void
message(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
-
- /**
- * Report a message.
- *
- * @param msg text of message to output
- * @param sourceNode node in source where message occurred
- * @param styleNode node in stylesheet where message occurred
- */
- virtual void
- message(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const = 0;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const = 0;
/**
* Report a message.
@@ -454,27 +441,14 @@
* Report a warning.
*
* @param msg text of message to output
- * @param sourceNode node in source where the warning occurred
- * @param styleNode node in stylesheet where the warning occurred
- */
- virtual void
- warn(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
-
- /**
- * Report a warning.
- *
- * @param msg text of message to output
* @param sourceNode node in source where warning occurred
* @param styleNode node in stylesheet where warning occurred
*/
virtual void
warn(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const = 0;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const = 0;
/**
* Report a warning.
@@ -489,18 +463,6 @@
const Locator& locator,
const XalanNode* sourceNode = 0) const = 0;
- /**
- * Report an error and throw an exception.
- *
- * @param msg text of message to output
- * @param sourceNode node in source where error occurred
- * @param styleNode node in stylesheet where error occurred
- */
- virtual void
- error(
- const XalanDOMString& msg,
- const XalanNode* sourceNode = 0,
- const XalanNode* styleNode = 0) const = 0;
/**
* Report an error and throw an exception.
@@ -512,8 +474,8 @@
virtual void
error(
const XalanDOMString& msg,
- const XalanNode* sourceNode,
- const ElemTemplateElement* styleNode) const = 0;
+ const XalanNode* sourceNode = 0,
+ const ElemTemplateElement* styleNode = 0) const = 0;
/**
* Report an error and throw an exception.
1.14 +34 -11 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp
Index: XSLTProcessorEnvSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupport.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSLTProcessorEnvSupport.hpp 19 Oct 2001 18:42:23 -0000 1.13
+++ XSLTProcessorEnvSupport.hpp 3 Nov 2002 03:36:25 -0000 1.14
@@ -71,6 +71,7 @@
+class ElemTemplateElement;
class XSLTProcessor;
@@ -85,6 +86,39 @@
~XSLTProcessorEnvSupport();
+ // These interfaces are new...
+
+ /**
+ * Function that is called when a problem event occurs.
+ *
+ * @param where either eXMLParser, eXSLTProcessor,
+ * eXPATHParser,
eXPATHProcessor, or eDataSource.
+ * @param classification either eWarning, or eError
+ * @param resolver resolver for namespace resolution
+ * @param sourceNode source tree node where the problem occurred
+ * (may be 0)
+ * @param styleNode stylesheet node where the problem occurred
+ * (may be 0)
+ * @param msg string message explaining the problem.
+ * @param uri the URI of the stylesheet, if
available. May be 0;
+ * @param lineNo line number where the problem occurred,
+ * if it is known, else -1
+ * @param charOffset character offset where the problem,
+ * occurred if it is known, else -1
+ * @return true if the return is an ERROR, in which case exception will be
+ * thrown. Otherwise the processor will continue to process.
+ */
+ virtual bool
+ problem(
+ eSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset) const = 0;
+
// These interfaces are inherited from XPathEnvSupport...
virtual XalanDocument*
@@ -121,17 +155,6 @@
XalanNode*
context,
const XObjectArgVectorType& argVec,
const Locator* locator) const
= 0;
-
- virtual bool
- problem(
- eSource where,
- eClassification classification,
- const XalanNode* styleNode,
- const XalanNode* sourceNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset)
const = 0;
virtual bool
problem(
1.29 +14 -17 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp
Index: XSLTProcessorEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XSLTProcessorEnvSupportDefault.cpp 26 Oct 2002 01:08:21 -0000 1.28
+++ XSLTProcessorEnvSupportDefault.cpp 3 Nov 2002 03:36:25 -0000 1.29
@@ -304,21 +304,21 @@
bool
XSLTProcessorEnvSupportDefault::problem(
- eSource /* where */,
- eClassification classification,
- const XalanNode* styleNode,
- const XalanNode* sourceNode,
- const XalanDOMString& msg,
- const XalanDOMChar* /* uri */,
- int /* lineNo */,
- int /* charOffset
*/) const
+ eSource /* where */,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* /* uri */,
+ int /*
lineNo */,
+ int /*
charOffset */) const
{
if (classification == XPathEnvSupport::eError)
{
m_processor->error(
msg,
- styleNode,
- sourceNode);
+ sourceNode,
+ styleNode);
return true;
}
@@ -326,8 +326,8 @@
{
m_processor->warn(
msg,
- styleNode,
- sourceNode);
+ sourceNode,
+ styleNode);
return false;
}
@@ -335,8 +335,8 @@
{
m_processor->message(
msg,
- styleNode,
- sourceNode);
+ sourceNode,
+ styleNode);
return false;
}
@@ -359,7 +359,6 @@
{
m_processor->error(
msg,
- 0,
sourceNode);
return true;
@@ -368,7 +367,6 @@
{
m_processor->warn(
msg,
- 0,
sourceNode);
return false;
@@ -377,7 +375,6 @@
{
m_processor->message(
msg,
- 0,
sourceNode);
return false;
1.21 +14 -11 xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp
Index: XSLTProcessorEnvSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTProcessorEnvSupportDefault.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XSLTProcessorEnvSupportDefault.hpp 19 Oct 2001 18:42:23 -0000 1.20
+++ XSLTProcessorEnvSupportDefault.hpp 3 Nov 2002 03:36:25 -0000 1.21
@@ -150,6 +150,20 @@
const XalanDOMString& theNamespace,
const XalanDOMString& functionName);
+
+ // These interfaces are inherited from XSLTProcessorEnvSupport...
+
+ virtual bool
+ problem(
+ eSource where,
+ eClassification classification,
+ const XalanNode* sourceNode,
+ const ElemTemplateElement* styleNode,
+ const XalanDOMString& msg,
+ const XalanDOMChar* uri,
+ int lineNo,
+ int
charOffset) const;
+
// These interfaces are inherited from XPathEnvSupport...
virtual XalanDocument*
@@ -186,17 +200,6 @@
XalanNode*
context,
const XObjectArgVectorType& argVec,
const Locator* locator) const;
-
- virtual bool
- problem(
- eSource where,
- eClassification classification,
- const XalanNode* styleNode,
- const XalanNode* sourceNode,
- const XalanDOMString& msg,
- const XalanDOMChar* uri,
- int lineNo,
- int charOffset)
const;
virtual bool
problem(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
