dbertoni 02/05/10 14:53:26
Modified: c/src/XalanTransformer XalanDefaultDocumentBuilder.cpp
XalanDefaultParsedSource.cpp
XalanDefaultParsedSource.hpp
XalanSourceTreeWrapperParsedSource.cpp
Log:
Straightened out chaining of parser liaisons.
Revision Changes Path
1.7 +1 -1
xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.cpp
Index: XalanDefaultDocumentBuilder.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultDocumentBuilder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanDefaultDocumentBuilder.cpp 4 Jan 2002 00:54:11 -0000 1.6
+++ XalanDefaultDocumentBuilder.cpp 10 May 2002 21:53:26 -0000 1.7
@@ -95,7 +95,7 @@
XalanParsedSourceHelper*
XalanDefaultDocumentBuilder::createHelper() const
{
- return new XalanDefaultParsedSourceHelper(m_domSupport,
m_parserLiaison);
+ return new XalanDefaultParsedSourceHelper(m_domSupport);
}
1.12 +9 -10
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp
Index: XalanDefaultParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanDefaultParsedSource.cpp 10 May 2002 21:14:07 -0000 1.11
+++ XalanDefaultParsedSource.cpp 10 May 2002 21:53:26 -0000 1.12
@@ -78,8 +78,10 @@
-XalanDefaultParsedSourceDOMSupport::XalanDefaultParsedSourceDOMSupport(const
XalanSourceTreeDOMSupport& theDOMSupport) :
- XalanSourceTreeDOMSupport(),
+XalanDefaultParsedSourceDOMSupport::XalanDefaultParsedSourceDOMSupport(
+ const XalanSourceTreeParserLiaison&
theParserLiaison,
+ const XalanSourceTreeDOMSupport&
theDOMSupport) :
+ XalanSourceTreeDOMSupport(theParserLiaison),
m_domSupport(theDOMSupport)
{
}
@@ -137,13 +139,10 @@
-XalanDefaultParsedSourceHelper::XalanDefaultParsedSourceHelper(
- const XalanSourceTreeDOMSupport&
theSourceDOMSupport,
- const XalanSourceTreeParserLiaison&
theSourceParserLiaison) :
- m_domSupport(theSourceDOMSupport),
- m_parserLiaison()
+XalanDefaultParsedSourceHelper::XalanDefaultParsedSourceHelper(const
XalanSourceTreeDOMSupport& theSourceDOMSupport) :
+ m_parserLiaison(),
+ m_domSupport(m_parserLiaison, theSourceDOMSupport)
{
- m_domSupport.setParserLiaison(&m_parserLiaison);
}
@@ -176,8 +175,8 @@
ErrorHandler* theErrorHandler,
EntityResolver* theEntityResolver) :
XalanParsedSource(),
- m_domSupport(),
m_parserLiaison(),
+ m_domSupport(m_parserLiaison),
m_parsedSource(0)
{
m_parserLiaison.setUseValidation(fValidate);
@@ -227,7 +226,7 @@
XalanParsedSourceHelper*
XalanDefaultParsedSource::createHelper() const
{
- return new XalanDefaultParsedSourceHelper(m_domSupport,
m_parserLiaison);
+ return new XalanDefaultParsedSourceHelper(m_domSupport);
}
1.12 +8 -8
xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp
Index: XalanDefaultParsedSource.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanDefaultParsedSource.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XalanDefaultParsedSource.hpp 10 May 2002 21:14:07 -0000 1.11
+++ XalanDefaultParsedSource.hpp 10 May 2002 21:53:26 -0000 1.12
@@ -84,7 +84,9 @@
{
public:
- XalanDefaultParsedSourceDOMSupport(const XalanSourceTreeDOMSupport&
theDOMSupport);
+ XalanDefaultParsedSourceDOMSupport(
+ const XalanSourceTreeParserLiaison&
theParserLiaison,
+ const XalanSourceTreeDOMSupport&
theDOMSupport);
virtual
~XalanDefaultParsedSourceDOMSupport();
@@ -123,9 +125,7 @@
{
public:
- XalanDefaultParsedSourceHelper(
- const XalanSourceTreeDOMSupport&
theSourceDOMSupport,
- const XalanSourceTreeParserLiaison&
theSourceParserLiaison);
+ XalanDefaultParsedSourceHelper(const XalanSourceTreeDOMSupport&
theSourceDOMSupport);
~XalanDefaultParsedSourceHelper();
@@ -145,9 +145,9 @@
// Data members...
- XalanDefaultParsedSourceDOMSupport m_domSupport;
-
XalanSourceTreeParserLiaison m_parserLiaison;
+
+ XalanDefaultParsedSourceDOMSupport m_domSupport;
};
@@ -188,9 +188,9 @@
// Data members...
- XalanSourceTreeDOMSupport m_domSupport;
-
XalanSourceTreeParserLiaison m_parserLiaison;
+
+ XalanSourceTreeDOMSupport m_domSupport;
XalanSourceTreeDocument* m_parsedSource;
1.2 +1 -1
xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp
Index: XalanSourceTreeWrapperParsedSource.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XalanTransformer/XalanSourceTreeWrapperParsedSource.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XalanSourceTreeWrapperParsedSource.cpp 10 May 2002 21:14:07 -0000
1.1
+++ XalanSourceTreeWrapperParsedSource.cpp 10 May 2002 21:53:26 -0000
1.2
@@ -105,7 +105,7 @@
XalanParsedSourceHelper*
XalanSourceTreeWrapperParsedSource::createHelper() const
{
- return new XalanDefaultParsedSourceHelper(m_domSupport,
m_parserLiaison);
+ return new XalanDefaultParsedSourceHelper(m_domSupport);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
