knoaman 2002/12/05 08:23:33
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.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.in 4 Dec 2002 02:47:24 -0000 1.5
+++ Makefile.in 5 Dec 2002 16:23:33 -0000 1.6
@@ -85,6 +85,7 @@
IANAEncodings.hpp \
IGXMLScanner.hpp \
ReaderMgr.hpp \
+ SGXMLScanner.hpp \
VecAttrListImpl.hpp \
VecAttributesImpl.hpp \
WFXMLScanner.hpp \
@@ -102,6 +103,7 @@
IGXMLScanner.$(TO) \
IGXMLScanner2.$(TO) \
ReaderMgr.$(TO) \
+ SGXMLScanner.$(TO) \
VecAttrListImpl.$(TO) \
VecAttributesImpl.$(TO) \
WFXMLScanner.$(TO) \
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLScannerResolver.cpp 4 Dec 2002 01:44:21 -0000 1.1
+++ XMLScannerResolver.cpp 5 Dec 2002 16:23:33 -0000 1.2
@@ -65,6 +65,7 @@
#include <xercesc/internal/XMLScannerResolver.hpp>
#include <xercesc/internal/IGXMLScanner.hpp>
#include <xercesc/internal/WFXMLScanner.hpp>
+#include <xercesc/internal/SGXMLScanner.hpp>
XERCES_CPP_NAMESPACE_BEGIN
@@ -85,6 +86,8 @@
return new WFXMLScanner(valToAdopt);
else if (XMLString::equals(scannerName, XMLUni::fgIGScanner))
return new IGXMLScanner(valToAdopt);
+ else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
+ return new SGXMLScanner(valToAdopt);
// REVISIT: throw an exception or return a default one?
return 0;
@@ -102,6 +105,8 @@
return new WFXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
else if (XMLString::equals(scannerName, XMLUni::fgIGScanner))
return new IGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
+ else if (XMLString::equals(scannerName, XMLUni::fgSGScanner))
+ return new SGXMLScanner(docHandler, docTypeHandler, entityHandler,
errReporter, valToAdopt);
// REVISIT: throw an exception or return a default one?
return 0;
1.22 +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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLUni.cpp 4 Dec 2002 02:21:50 -0000 1.21
+++ XMLUni.cpp 5 Dec 2002 16:23:33 -0000 1.22
@@ -655,6 +655,12 @@
, chLatin_n, chLatin_e, chLatin_r, chNull
};
+const XMLCh XMLUni::fgSGScanner[] =
+{
+ chLatin_S, 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.20 +2 -2 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- XMLUni.hpp 4 Dec 2002 02:21:50 -0000 1.19
+++ XMLUni.hpp 5 Dec 2002 16:23:33 -0000 1.20
@@ -193,7 +193,7 @@
static const XMLCh fgApos[];
static const XMLCh fgWFScanner[];
static const XMLCh fgIGScanner[];
-
+ static const XMLCh fgSGScanner[];
// Exception Name
static const XMLCh fgArrayIndexOutOfBoundsException_Name[];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
