dbertoni 00/09/19 07:48:48
Modified: c/src/XercesParserLiaison XercesDocumentBridge.cpp
XercesDocumentBridge.hpp
XercesNamedNodeListCache.hpp
XercesParserLiaison.cpp XercesParserLiaison.hpp
Log:
Changes for AIX port and for output transcoding.
Revision Changes Path
1.12 +4 -65
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XercesDocumentBridge.cpp 2000/08/22 20:19:19 1.11
+++ XercesDocumentBridge.cpp 2000/09/19 14:47:22 1.12
@@ -96,7 +96,6 @@
#include "XercesNotationBridge.hpp"
#include "XercesProcessingInstructionBridge.hpp"
#include "XercesTextBridge.hpp"
-#include "XercesTreeWalker.hpp"
@@ -1678,66 +1677,6 @@
-// Helper class to walk the tree and build everything...
-class BuildBridgeTreeWalker : public XercesTreeWalker
-{
-public:
-
- typedef XercesDocumentBridge::NavigatorBridgeVectorType
NavigatorBridgeVectorType;
-
- BuildBridgeTreeWalker(
- XercesDocumentBridge* theDocument,
- XercesBridgeNavigator* theDocumentNavigator,
- NavigatorBridgeVectorType& theNavigators,
- unsigned long theStartIndex);
-
- virtual
- ~BuildBridgeTreeWalker();
-
-protected:
-
- virtual void
- startNode(const DOM_Node& node);
-
- virtual void
- endNode(const DOM_Node& node);
-
-private:
-
- XercesDocumentBridge* m_document;
-
- NavigatorBridgeVectorType& m_navigators;
-
- unsigned long m_currentIndex;
-
- struct NavigatorStackEntryType
- {
- NavigatorStackEntryType(
- XercesBridgeNavigator* theNavigator =
0,
- XalanNode*
theNode = 0) :
- m_navigator(theNavigator),
- m_node(theNode)
- {
- }
-
- XercesBridgeNavigator* m_navigator;
-
- XalanNode* m_node;
- };
-
-#if defined(XALAN_NO_NAMESPACES)
- typedef vector<NavigatorStackEntryType> NavigatorStackType;
-#else
- typedef std::vector<NavigatorStackEntryType> NavigatorStackType;
-#endif
-
- NavigatorStackType m_parentNavigatorStack;
-
- NavigatorStackType m_siblingNavigatorStack;
-};
-
-
-
void
XercesDocumentBridge::buildBridgeNodes()
{
@@ -1778,7 +1717,7 @@
-BuildBridgeTreeWalker::BuildBridgeTreeWalker(
+XercesDocumentBridge::BuildBridgeTreeWalker::BuildBridgeTreeWalker(
XercesDocumentBridge* theDocument,
XercesBridgeNavigator* theDocumentNavigator,
NavigatorBridgeVectorType& theNavigators,
@@ -1804,14 +1743,14 @@
-BuildBridgeTreeWalker::~BuildBridgeTreeWalker()
+XercesDocumentBridge::BuildBridgeTreeWalker::~BuildBridgeTreeWalker()
{
}
void
-BuildBridgeTreeWalker::startNode(const DOM_Node& node)
+XercesDocumentBridge::BuildBridgeTreeWalker::startNode(const DOM_Node&
node)
{
XalanNode* const theBridgeNode =
m_document->createBridgeNode(node, m_currentIndex, false);
@@ -1947,7 +1886,7 @@
void
-BuildBridgeTreeWalker::endNode(const DOM_Node& /* node */)
+XercesDocumentBridge::BuildBridgeTreeWalker::endNode(const DOM_Node& /* node
*/)
{
assert(m_parentNavigatorStack.empty() == false);
assert(m_siblingNavigatorStack.empty() == false);
1.8 +70 -10
xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesDocumentBridge.hpp 2000/08/22 20:19:20 1.7
+++ XercesDocumentBridge.hpp 2000/09/19 14:47:24 1.8
@@ -95,7 +95,9 @@
#include <XercesParserLiaison/XercesBridgeNavigator.hpp>
#include <XercesParserLiaison/XercesDocumentNamedNodeListCache.hpp>
#include <XercesParserLiaison/XercesNodeListBridge.hpp>
+#include <XercesParserLiaison/XercesTreeWalker.hpp>
+
#define XALAN_USE_BLOCK_ALLOCATORS
#if defined(XALAN_USE_BLOCK_ALLOCATORS)
@@ -366,6 +368,74 @@
void
buildBridgeNodes();
+#if defined(XALAN_NO_NAMESPACES)
+ typedef deque<XercesBridgeNavigator> NavigatorBridgeVectorType;
+
+ typedef deque<XalanNode*> NodeVectorType;
+#else
+ typedef std::deque<XercesBridgeNavigator>
NavigatorBridgeVectorType;
+
+ typedef std::deque<XalanNode*> NodeVectorType;
+#endif
+
+ // Helper class to walk the tree and build everything...
+ class BuildBridgeTreeWalker : public XercesTreeWalker
+ {
+ public:
+
+ typedef NavigatorBridgeVectorType
NavigatorBridgeVectorType;
+
+ BuildBridgeTreeWalker(
+ XercesDocumentBridge* theDocument,
+ XercesBridgeNavigator*
theDocumentNavigator,
+ NavigatorBridgeVectorType& theNavigators,
+ unsigned long
theStartIndex);
+
+ virtual
+ ~BuildBridgeTreeWalker();
+
+ struct NavigatorStackEntryType
+ {
+ NavigatorStackEntryType(
+ XercesBridgeNavigator*
theNavigator = 0,
+ XalanNode*
theNode = 0) :
+ m_navigator(theNavigator),
+ m_node(theNode)
+ {
+ }
+
+ XercesBridgeNavigator* m_navigator;
+
+ XalanNode* m_node;
+ };
+
+ #if defined(XALAN_NO_NAMESPACES)
+ typedef vector<NavigatorStackEntryType>
NavigatorStackType;
+ #else
+ typedef std::vector<NavigatorStackEntryType>
NavigatorStackType;
+ #endif
+
+ protected:
+
+ virtual void
+ startNode(const DOM_Node& node);
+
+ virtual void
+ endNode(const DOM_Node& node);
+
+ private:
+
+ XercesDocumentBridge* m_document;
+
+ NavigatorBridgeVectorType& m_navigators;
+
+ unsigned long m_currentIndex;
+
+ NavigatorStackType m_parentNavigatorStack;
+
+ NavigatorStackType m_siblingNavigatorStack;
+ };
+
private:
XalanNode*
@@ -487,16 +557,6 @@
mutable XercesToXalanNodeMap m_nodeMap;
XalanAutoPtr<XalanDOMImplementation> m_domImplementation;
-
-#if defined(XALAN_NO_NAMESPACES)
- typedef deque<XercesBridgeNavigator> NavigatorBridgeVectorType;
-
- typedef deque<XalanNode*> NodeVectorType;
-#else
- typedef std::deque<XercesBridgeNavigator>
NavigatorBridgeVectorType;
-
- typedef std::deque<XalanNode*> NodeVectorType;
-#endif
mutable NavigatorBridgeVectorType m_navigators;
1.4 +11 -11
xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.hpp
Index: XercesNamedNodeListCache.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNamedNodeListCache.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesNamedNodeListCache.hpp 2000/08/22 20:19:22 1.3
+++ XercesNamedNodeListCache.hpp 2000/09/19 14:47:37 1.4
@@ -95,8 +95,17 @@
virtual XercesNodeListBridge*
getElementsByTagNameNS(
- const XalanDOMString& namespaceURI,
- const XalanDOMString& localName)
const;
+ const XalanDOMString& namespaceURI,
+ const XalanDOMString& localName) const;
+
+#if defined(XALAN_NO_NAMESPACES)
+ typedef map<XalanDOMString,
+ XercesNodeListBridge*,
+ less<XalanDOMString> >
NodeListCacheType;
+#else
+ typedef std::map<XalanDOMString,
+ XercesNodeListBridge*>
NodeListCacheType;
+#endif
protected:
@@ -111,15 +120,6 @@
private:
const XercesBridgeNavigator& m_navigator;
-
-#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanDOMString,
- XercesNodeListBridge*,
- less<XalanDOMString> >
NodeListCacheType;
-#else
- typedef std::map<XalanDOMString,
- XercesNodeListBridge*>
NodeListCacheType;
-#endif
#if defined(XALAN_NO_MUTABLE)
NodeListCacheType m_cachedNodeLists;
1.18 +38 -15
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XercesParserLiaison.cpp 2000/09/05 02:24:56 1.17
+++ XercesParserLiaison.cpp 2000/09/19 14:47:38 1.18
@@ -433,46 +433,69 @@
void
-XercesParserLiaison::fatalError(const SAXParseException& e)
+XercesParserLiaison::fatalError(const SAXParseException& e)
{
#if !defined(XALAN_NO_NAMESPACES)
using std::cerr;
using std::endl;
#endif
- cerr << "\nFatal Error at (file " <<
DOMStringToStdString(e.getSystemId())
- << ", line " << e.getLineNumber()
- << ", char " << e.getColumnNumber()
- << "): " << DOMStringToStdString(e.getMessage()) << endl;
+ cerr << endl
+ << "Fatal Error at (file "
+ << e.getSystemId()
+ << ", line "
+ << e.getLineNumber()
+ << ", char"
+ << e.getColumnNumber()
+ << "): "
+ << e.getMessage()
+ << endl;
throw e;
}
-void XercesParserLiaison::error(const SAXParseException& e)
+
+
+void
+XercesParserLiaison::error(const SAXParseException& e)
{
#if !defined(XALAN_NO_NAMESPACES)
using std::cerr;
using std::endl;
#endif
- cerr << "\nError at (file " << DOMStringToStdString(e.getSystemId())
- << ", line " << e.getLineNumber()
- << ", char " << e.getColumnNumber()
- << "): " << DOMStringToStdString(e.getMessage()) << endl;
+ cerr << endl
+ << "Error at (file "
+ << e.getSystemId()
+ << ", line "
+ << e.getLineNumber()
+ << ", char"
+ << e.getColumnNumber()
+ << "): "
+ << e.getMessage()
+ << endl;
}
+
-void XercesParserLiaison::warning(const SAXParseException& e)
+void
+XercesParserLiaison::warning(const SAXParseException& e)
{
#if !defined(XALAN_NO_NAMESPACES)
using std::cerr;
using std::endl;
#endif
- cerr << "\nWarning at (file " << DOMStringToStdString(e.getSystemId())
- << ", line " << e.getLineNumber()
- << ", char " << e.getColumnNumber()
- << "): " << DOMStringToStdString(e.getMessage()) << endl;
+ cerr << endl
+ << "Warning at (file "
+ << e.getSystemId()
+ << ", line "
+ << e.getLineNumber()
+ << ", char"
+ << e.getColumnNumber()
+ << "): "
+ << e.getMessage()
+ << endl;
}
1.15 +9 -9
xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp
Index: XercesParserLiaison.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XercesParserLiaison.hpp 2000/08/31 19:43:20 1.14
+++ XercesParserLiaison.hpp 2000/09/19 14:47:38 1.15
@@ -374,6 +374,15 @@
virtual void
resetErrors();
+#if defined(XALAN_NO_NAMESPACES)
+ typedef map<const XalanDocument*,
+ XercesDocumentBridge*,
+ less<const XalanDocument*> > DocumentMapType;
+#else
+ typedef std::map<const XalanDocument*,
+ XercesDocumentBridge*>
DocumentMapType;
+#endif
+
protected:
virtual DOMParser*
@@ -395,15 +404,6 @@
bool buildBridge);
private:
-
-#if defined(XALAN_NO_NAMESPACES)
- typedef map<const XalanDocument*,
- XercesDocumentBridge*,
- less<const XalanDocument*> > DocumentMapType;
-#else
- typedef std::map<const XalanDocument*,
- XercesDocumentBridge*>
DocumentMapType;
-#endif
// Data members...
DOMSupport& m_DOMSupport;
