peiyongz 2004/10/28 13:16:31
Modified: c/src/xercesc/validators/datatype DatatypeValidator.hpp
DatatypeValidator.cpp
Log:
Data member reshuffle
Revision Changes Path
1.27 +18 -13
xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp
Index: DatatypeValidator.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.hpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DatatypeValidator.hpp 8 Sep 2004 13:56:52 -0000 1.26
+++ DatatypeValidator.hpp 28 Oct 2004 20:16:31 -0000 1.27
@@ -460,14 +460,6 @@
*/
void setNumeric(bool numeric);
- // -----------------------------------------------------------------------
- // Protected data members
- //
- // fMemoryManager
- // Pluggable memory manager for dynamic allocation/deallocation.
- // -----------------------------------------------------------------------
- MemoryManager* fMemoryManager;
-
private:
// -----------------------------------------------------------------------
// CleanUp methods
@@ -525,11 +517,18 @@
//
// -----------------------------------------------------------------------
bool fAnonymous;
+ bool fFinite;
+ bool fBounded;
+ bool fNumeric;
+
short fWhiteSpace;
int fFinalSet;
int fFacetsDefined;
int fFixed;
+
ValidatorType fType;
+ XSSimpleTypeDefinition::ORDERING fOrdered;
+
DatatypeValidator* fBaseValidator;
RefHashTableOf<KVStringPair>* fFacets;
XMLCh* fPattern;
@@ -537,10 +536,16 @@
XMLCh* fTypeName;
const XMLCh* fTypeLocalName;
const XMLCh* fTypeUri;
- XSSimpleTypeDefinition::ORDERING fOrdered;
- bool fFinite;
- bool fBounded;
- bool fNumeric;
+
+protected:
+ // -----------------------------------------------------------------------
+ // Protected data members
+ //
+ // fMemoryManager
+ // Pluggable memory manager for dynamic allocation/deallocation.
+ // -----------------------------------------------------------------------
+ MemoryManager* fMemoryManager;
+
};
1.27 +19 -13
xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp
Index: DatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/DatatypeValidator.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- DatatypeValidator.cpp 8 Sep 2004 13:56:52 -0000 1.26
+++ DatatypeValidator.cpp 28 Oct 2004 20:16:31 -0000 1.27
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.27 2004/10/28 20:16:31 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.26 2004/09/08 13:56:52 peiyongz
* Apache License Version 2.0
*
@@ -179,13 +182,16 @@
const int finalSet,
const ValidatorType type,
MemoryManager* const manager)
- : fMemoryManager(manager)
- , fAnonymous(false)
+ : fAnonymous(false)
+ , fFinite(false)
+ , fBounded(false)
+ , fNumeric(false)
, fWhiteSpace(COLLAPSE)
, fFinalSet(finalSet)
, fFacetsDefined(0)
, fFixed(0)
, fType(type)
+ , fOrdered(XSSimpleTypeDefinition::ORDERED_FALSE)
, fBaseValidator(baseValidator)
, fFacets(facets)
, fPattern(0)
@@ -193,10 +199,7 @@
, fTypeName(0)
, fTypeLocalName(XMLUni::fgZeroLenString)
, fTypeUri(XMLUni::fgZeroLenString)
- , fOrdered(XSSimpleTypeDefinition::ORDERED_FALSE)
- , fFinite(false)
- , fBounded(false)
- , fNumeric(false)
+ , fMemoryManager(manager)
{
}
@@ -317,16 +320,17 @@
if (serEng.isStoring())
{
serEng<<fAnonymous;
+ serEng<<fFinite;
+ serEng<<fBounded;
+ serEng<<fNumeric;
+
serEng<<fWhiteSpace;
serEng<<fFinalSet;
serEng<<fFacetsDefined;
serEng<<fFixed;
- serEng<<(int)fType;
+ serEng<<(int)fType;
serEng<<(int)fOrdered;
- serEng<<fFinite;
- serEng<<fBounded;
- serEng<<fNumeric;
storeDV(serEng, fBaseValidator);
@@ -361,6 +365,10 @@
else
{
serEng>>fAnonymous;
+ serEng>>fFinite;
+ serEng>>fBounded;
+ serEng>>fNumeric;
+
serEng>>fWhiteSpace;
serEng>>fFinalSet;
serEng>>fFacetsDefined;
@@ -372,9 +380,7 @@
serEng>>type;
fOrdered = (XSSimpleTypeDefinition::ORDERING)type;
- serEng>>fFinite;
- serEng>>fBounded;
- serEng>>fNumeric;
+
fBaseValidator = loadDV(serEng);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
