knoaman 2002/12/09 07:47:49
Modified: c/src/xercesc/internal Makefile.in XMLScannerResolver.cpp
c/src/xercesc/util XMLUni.cpp XMLUni.hpp
Log:
Scanner re-organization.
Revision Changes Path
1.7 +3 -1 xml-xerces/c/src/xercesc/internal/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.in 5 Dec 2002 16:23:33 -0000 1.6
+++ Makefile.in 9 Dec 2002 15:47:49 -0000 1.7
@@ -80,6 +80,7 @@
INTERNAL_CPP_PUBHEADERS = \
CharTypeTables.hpp \
+ DGXMLScanner.hpp \
ElemStack.hpp \
EndOfEntityException.hpp \
IANAEncodings.hpp \
@@ -99,6 +100,7 @@
INTERNAL_C_FILES =
INTERNAL_CPP_OBJECTS = \
+ DGXMLScanner.$(TO) \
ElemStack.$(TO) \
IGXMLScanner.$(TO) \
IGXMLScanner2.$(TO) \
1.3 +6 -1 xml-xerces/c/src/xercesc/internal/XMLScannerResolver.cpp
Index: XMLScannerResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScannerResolver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLScannerResolver.cpp 5 Dec 2002 16:23:33 -0000 1.2
+++ XMLScannerResolver.cpp 9 Dec 2002 15:47:49 -0000 1.3
@@ -66,6 +66,7 @@
#include <xercesc/internal/IGXMLScanner.hpp>
#include <xercesc/internal/WFXMLScanner.hpp>
#include <xercesc/internal/SGXMLScanner.hpp>
+#include <xercesc/internal/DGXMLScanner.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -88,6 +89,8 @@
return new IGXMLScanner(valToAdopt);
else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
return new SGXMLScanner(valToAdopt);
+ else if (XMLString::equals(scannerName, XMLUni::fgDGScanner))
+ return new DGXMLScanner(valToAdopt);
// REVISIT: throw an exception or return a default one?
return 0;
@@ -107,6 +110,8 @@
return new IGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
return new SGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
+ else if (XMLString::equals(scannerName, XMLUni::fgDGScanner))
+ return new DGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
// REVISIT: throw an exception or return a default one?
return 0;
1.23 +7 -1 xml-xerces/c/src/xercesc/util/XMLUni.cpp
Index: XMLUni.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XMLUni.cpp 5 Dec 2002 16:23:33 -0000 1.22
+++ XMLUni.cpp 9 Dec 2002 15:47:49 -0000 1.23
@@ -661,6 +661,12 @@
, chLatin_n, chLatin_e, chLatin_r, chNull
};
+const XMLCh XMLUni::fgDGScanner[] =
+{
+ chLatin_D, chLatin_G, chLatin_S, chLatin_c, chLatin_a, chLatin_n
+ , chLatin_n, chLatin_e, chLatin_r, chNull
+};
+
//Exception strings
const XMLCh XMLUni::fgArrayIndexOutOfBoundsException_Name[] =
{
1.21 +2 -1 xml-xerces/c/src/xercesc/util/XMLUni.hpp
Index: XMLUni.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLUni.hpp 5 Dec 2002 16:23:33 -0000 1.20
+++ XMLUni.hpp 9 Dec 2002 15:47:49 -0000 1.21
@@ -194,6 +194,7 @@
static const XMLCh fgWFScanner[];
static const XMLCh fgIGScanner[];
static const XMLCh fgSGScanner[];
+ static const XMLCh fgDGScanner[];
// Exception Name
static const XMLCh fgArrayIndexOutOfBoundsException_Name[];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
