knoaman 2002/12/03 18:21:50
Modified: c/src/xercesc/util XMLUni.hpp XMLUni.cpp
Log:
Scanner re-organization.
Revision Changes Path
1.19 +10 -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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XMLUni.hpp 12 Nov 2002 17:25:17 -0000 1.18
+++ XMLUni.hpp 4 Dec 2002 02:21:50 -0000 1.19
@@ -186,6 +186,13 @@
static const XMLCh fgYesString[];
static const XMLCh fgZeroLenString[];
static const XMLCh fgDTDEntityString[];
+ static const XMLCh fgAmp[];
+ static const XMLCh fgLT[];
+ static const XMLCh fgGT[];
+ static const XMLCh fgQuot[];
+ static const XMLCh fgApos[];
+ static const XMLCh fgWFScanner[];
+ static const XMLCh fgIGScanner[];
// Exception Name
@@ -233,6 +240,8 @@
static const XMLCh fgXercesUserAdoptsDOMDocument[];
static const XMLCh fgXercesCacheGrammarFromParse[];
static const XMLCh fgXercesUseCachedGrammarInParse[];
+ static const XMLCh fgXercesScannerName[];
+ static const XMLCh fgXercesCalculateSrcOfs[];
// SAX2 features/properties names
static const XMLCh fgSAX2CoreValidation[];
1.21 +67 -4 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- XMLUni.cpp 12 Nov 2002 17:25:17 -0000 1.20
+++ XMLUni.cpp 4 Dec 2002 02:21:50 -0000 1.21
@@ -62,7 +62,6 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLUniDefs.hpp>
#include <xercesc/util/XMLUni.hpp>
@@ -609,14 +608,51 @@
const XMLCh XMLUni::fgYesString[] =
{
- chLatin_y, chLatin_e, chLatin_s, chNull
+ chLatin_y, chLatin_e, chLatin_s, chNull
};
const XMLCh XMLUni::fgZeroLenString[] = { chNull };
const XMLCh XMLUni::fgDTDEntityString[] =
{
- chOpenSquare, chLatin_d, chLatin_t, chLatin_d, chCloseSquare, chNull
+ chOpenSquare, chLatin_d, chLatin_t, chLatin_d, chCloseSquare, chNull
+};
+
+const XMLCh XMLUni::fgAmp[] =
+{
+ chLatin_a, chLatin_m, chLatin_p, chNull
+};
+
+const XMLCh XMLUni::fgLT[] =
+{
+ chLatin_l, chLatin_t, chNull
+};
+
+const XMLCh XMLUni::fgGT[] =
+{
+ chLatin_g, chLatin_t, chNull
+};
+
+const XMLCh XMLUni::fgQuot[] =
+{
+ chLatin_q, chLatin_u, chLatin_o, chLatin_t, chNull
+};
+
+const XMLCh XMLUni::fgApos[] =
+{
+ chLatin_a, chLatin_p, chLatin_o, chLatin_s, chNull
+};
+
+const XMLCh XMLUni::fgWFScanner[] =
+{
+ chLatin_W, chLatin_F, chLatin_S, chLatin_c, chLatin_a, chLatin_n
+ , chLatin_n, chLatin_e, chLatin_r, chNull
+};
+
+const XMLCh XMLUni::fgIGScanner[] =
+{
+ chLatin_I, chLatin_G, chLatin_S, chLatin_c, chLatin_a, chLatin_n
+ , chLatin_n, chLatin_e, chLatin_r, chNull
};
//Exception strings
@@ -955,6 +991,19 @@
, chLatin_f, chLatin_a, chLatin_t, chLatin_a, chLatin_l, chNull
};
+//Xerces: http://apache.org/xml/features/calculate-src-ofs
+const XMLCh XMLUni::fgXercesCalculateSrcOfs[] =
+{
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
+ , chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
+ , chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
+ , chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_f, chLatin_e
+ , chLatin_a, chLatin_t, chLatin_u, chLatin_r, chLatin_e, chLatin_s
+ , chForwardSlash, chLatin_c, chLatin_a, chLatin_l, chLatin_c, chLatin_u
+ , chLatin_l, chLatin_a, chLatin_t, chLatin_e, chDash, chLatin_s, chLatin_r
+ , chLatin_c, chDash, chLatin_o, chLatin_f, chLatin_s, chNull
+};
+
//Property
//Xerces: http://apache.org/xml/properties/schema/external-schemaLocation
@@ -988,6 +1037,20 @@
, chLatin_p, chLatin_a, chLatin_c, chLatin_e, chLatin_S, chLatin_c, chLatin_h
, chLatin_e, chLatin_m, chLatin_a, chLatin_L, chLatin_o, chLatin_c, chLatin_a
, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull
+};
+
+//Property
+//Xerces: http://apache.org/xml/properties/scannerName
+const XMLCh XMLUni::fgXercesScannerName[] =
+{
+ chLatin_h, chLatin_t, chLatin_t, chLatin_p, chColon, chForwardSlash
+ , chForwardSlash, chLatin_a, chLatin_p, chLatin_a, chLatin_c, chLatin_h
+ , chLatin_e, chPeriod, chLatin_o, chLatin_r, chLatin_g, chForwardSlash
+ , chLatin_x, chLatin_m, chLatin_l, chForwardSlash, chLatin_p, chLatin_r
+ , chLatin_o, chLatin_p, chLatin_e, chLatin_r, chLatin_t, chLatin_i
+ , chLatin_e, chLatin_s, chForwardSlash, chLatin_s, chLatin_c, chLatin_a
+ , chLatin_n, chLatin_n, chLatin_e, chLatin_r, chLatin_N, chLatin_a
+ , chLatin_m, chLatin_e, chNull
};
//Xerces: http://apache.org/xml/features/dom/user-adopts-DOMDocument
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
