peiyongz 2004/10/28 13:21:07
Modified: c/src/xercesc/validators/schema SchemaGrammar.hpp
SchemaGrammar.cpp SchemaElementDecl.hpp
SchemaElementDecl.cpp SchemaAttDef.hpp
SchemaAttDef.cpp ComplexTypeInfo.hpp
ComplexTypeInfo.cpp
Log:
Data member reshuffle
Revision Changes Path
1.18 +6 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp
Index: SchemaGrammar.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SchemaGrammar.hpp 28 Sep 2004 02:14:14 -0000 1.17
+++ SchemaGrammar.hpp 28 Oct 2004 20:21:06 -0000 1.18
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.18 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.17 2004/09/28 02:14:14 cargilld
* Add support for validating annotations.
*
@@ -421,10 +424,11 @@
RefHash2KeysTableOf<ElemVector>* fValidSubstitutionGroups;
ValidationContext* fValidationContext;
MemoryManager* fMemoryManager;
- bool fValidated;
- DatatypeValidatorFactory fDatatypeRegistry;
XMLSchemaDescription* fGramDesc;
RefHashTableOf<XSAnnotation>* fAnnotations;
+
+ bool fValidated;
+ DatatypeValidatorFactory fDatatypeRegistry;
};
1.22 +5 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp
Index: SchemaGrammar.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaGrammar.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SchemaGrammar.cpp 8 Sep 2004 13:56:56 -0000 1.21
+++ SchemaGrammar.cpp 28 Oct 2004 20:21:06 -0000 1.22
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.22 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.21 2004/09/08 13:56:56 peiyongz
* Apache License Version 2.0
*
@@ -152,10 +155,10 @@
, fValidSubstitutionGroups(0)
, fValidationContext(0)
, fMemoryManager(manager)
- , fValidated(false)
- , fDatatypeRegistry(manager)
, fGramDesc(0)
, fAnnotations(0)
+ , fValidated(false)
+ , fDatatypeRegistry(manager)
{
//
// Init all the pool members.
1.23 +8 -3 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp
Index: SchemaElementDecl.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- SchemaElementDecl.hpp 8 Sep 2004 13:56:56 -0000 1.22
+++ SchemaElementDecl.hpp 28 Oct 2004 20:21:06 -0000 1.23
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.23 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.22 2004/09/08 13:56:56 peiyongz
* Apache License Version 2.0
*
@@ -492,7 +495,9 @@
// -----------------------------------------------------------------------
ModelTypes fModelType;
PSVIDefs::PSVIScope fPSVIScope;
- DatatypeValidator* fDatatypeValidator;
+ PSVIDefs::Validity fValidity;
+ PSVIDefs::Validation fValidation;
+
int fEnclosingScope;
int fFinalSet;
int fBlockSet;
@@ -505,8 +510,8 @@
RefVectorOf<IdentityConstraint>* fIdentityConstraints;
SchemaAttDef* fAttWildCard;
SchemaElementDecl* fSubstitutionGroupElem;
- PSVIDefs::Validity fValidity;
- PSVIDefs::Validation fValidation;
+ DatatypeValidator* fDatatypeValidator;
+
bool fSeenValidation;
bool fSeenNoValidation;
bool fHadContent;
1.22 +18 -15 xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp
Index: SchemaElementDecl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaElementDecl.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- SchemaElementDecl.cpp 13 Oct 2004 17:55:40 -0000 1.21
+++ SchemaElementDecl.cpp 28 Oct 2004 20:21:06 -0000 1.22
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.22 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.21 2004/10/13 17:55:40 cargilld
* Serialization fix, fPVSIScope not serialized. Problem reported by David Bertoni.
*
@@ -156,7 +159,8 @@
XMLElementDecl(manager)
, fModelType(Any)
, fPSVIScope(PSVIDefs::SCP_ABSENT)
- , fDatatypeValidator(0)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
, fEnclosingScope(Grammar::TOP_LEVEL_SCOPE)
, fFinalSet(0)
, fBlockSet(0)
@@ -169,8 +173,7 @@
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
+ , fDatatypeValidator(0)
, fSeenValidation(false)
, fSeenNoValidation(false)
, fHadContent(false)
@@ -186,7 +189,8 @@
XMLElementDecl(manager)
, fModelType(type)
, fPSVIScope(PSVIDefs::SCP_ABSENT)
- , fDatatypeValidator(0)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
, fEnclosingScope(enclosingScope)
, fFinalSet(0)
, fBlockSet(0)
@@ -199,8 +203,7 @@
, fIdentityConstraints(0)
, fAttWildCard(0)
, fSubstitutionGroupElem(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
+ , fDatatypeValidator(0)
, fSeenValidation(false)
, fSeenNoValidation(false)
, fHadContent(false)
@@ -417,7 +420,8 @@
{
serEng<<(int)fModelType;
serEng<<(int)fPSVIScope;
- DatatypeValidator::storeDV(serEng, fDatatypeValidator);
+ serEng<<(int)fValidity;
+ serEng<<(int)fValidation;
serEng<<fEnclosingScope;
serEng<<fFinalSet;
@@ -445,8 +449,8 @@
serEng<<fAttWildCard;
serEng<<fSubstitutionGroupElem;
- serEng<<(int)fValidity;
- serEng<<(int)fValidation;
+ DatatypeValidator::storeDV(serEng, fDatatypeValidator);
+
serEng<<fSeenValidation;
serEng<<fSeenNoValidation;
serEng<<fHadContent;
@@ -459,7 +463,10 @@
fModelType = (ModelTypes)i;
serEng>>i;
fPSVIScope = (PSVIDefs::PSVIScope)i;
- fDatatypeValidator = DatatypeValidator::loadDV(serEng);
+ serEng>>i;
+ fValidity = (PSVIDefs::Validity)i;
+ serEng>> i;
+ fValidation = (PSVIDefs::Validation)i;
serEng>>fEnclosingScope;
serEng>>fFinalSet;
@@ -486,12 +493,8 @@
serEng>>fAttWildCard;
serEng>>fSubstitutionGroupElem;
+ fDatatypeValidator = DatatypeValidator::loadDV(serEng);
- serEng>>i;
- fValidity = (PSVIDefs::Validity)i;
-
- serEng>> i;
- fValidation = (PSVIDefs::Validation)i;
serEng>>fSeenValidation;
serEng>>fSeenNoValidation;
serEng>>fHadContent;
1.15 +8 -3 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp
Index: SchemaAttDef.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SchemaAttDef.hpp 20 Sep 2004 14:47:13 -0000 1.14
+++ SchemaAttDef.hpp 28 Oct 2004 20:21:06 -0000 1.15
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.15 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.14 2004/09/20 14:47:13 amassari
* Mark some methods as deprecated
*
@@ -330,14 +333,16 @@
// easy access the XSAnnotation object).
// -----------------------------------------------------------------------
unsigned int fElemId;
+
+ PSVIDefs::Validity fValidity;
+ PSVIDefs::Validation fValidation;
+ PSVIDefs::PSVIScope fPSVIScope;
+
QName* fAttName;
DatatypeValidator* fDatatypeValidator;
DatatypeValidator* fAnyDatatypeValidator;
const DatatypeValidator* fMemberTypeValidator;
ValueVectorOf<unsigned int>* fNamespaceList;
- PSVIDefs::Validity fValidity;
- PSVIDefs::Validation fValidation;
- PSVIDefs::PSVIScope fPSVIScope;
SchemaAttDef* fBaseAttDecl;
};
1.16 +32 -26 xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp
Index: SchemaAttDef.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaAttDef.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SchemaAttDef.cpp 13 Oct 2004 17:55:40 -0000 1.15
+++ SchemaAttDef.cpp 28 Oct 2004 20:21:06 -0000 1.16
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.16 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.15 2004/10/13 17:55:40 cargilld
* Serialization fix, fPVSIScope not serialized. Problem reported by David Bertoni.
*
@@ -102,14 +105,14 @@
SchemaAttDef::SchemaAttDef(MemoryManager* const manager) :
XMLAttDef(XMLAttDef::CData, XMLAttDef::Implied, manager)
, fElemId(XMLElementDecl::fgInvalidElemId)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
+ , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fAttName(0)
, fDatatypeValidator(0)
, fAnyDatatypeValidator(0)
, fMemberTypeValidator(0)
, fNamespaceList(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
- , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fBaseAttDecl(0)
{
}
@@ -122,13 +125,13 @@
, MemoryManager* const manager) :
XMLAttDef(type, defType, manager)
, fElemId(XMLElementDecl::fgInvalidElemId)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
+ , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fDatatypeValidator(0)
, fAnyDatatypeValidator(0)
, fMemberTypeValidator(0)
, fNamespaceList(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
- , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fBaseAttDecl(0)
{
fAttName = new (manager) QName(prefix, localPart, uriId, manager);
@@ -145,13 +148,13 @@
XMLAttDef(attValue, type, defType, enumValues, manager)
, fElemId(XMLElementDecl::fgInvalidElemId)
+ , fValidity(PSVIDefs::UNKNOWN)
+ , fValidation(PSVIDefs::NONE)
+ , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fDatatypeValidator(0)
, fAnyDatatypeValidator(0)
, fMemberTypeValidator(0)
, fNamespaceList(0)
- , fValidity(PSVIDefs::UNKNOWN)
- , fValidation(PSVIDefs::NONE)
- , fPSVIScope(PSVIDefs::SCP_ABSENT)
, fBaseAttDecl(0)
{
fAttName = new (manager) QName(prefix, localPart, uriId, manager);
@@ -163,14 +166,14 @@
other->getDefaultType(), other->getEnumeration(),
other->getMemoryManager())
, fElemId(XMLElementDecl::fgInvalidElemId)
+ , fValidity(other->fValidity)
+ , fValidation(other->fValidation)
+ , fPSVIScope(other->fPSVIScope)
, fAttName(0)
, fDatatypeValidator(other->fDatatypeValidator)
, fAnyDatatypeValidator(other->fAnyDatatypeValidator)
, fMemberTypeValidator(other->fMemberTypeValidator)
, fNamespaceList(0)
- , fValidity(other->fValidity)
- , fValidation(other->fValidation)
- , fPSVIScope(other->fPSVIScope)
, fBaseAttDecl(other->fBaseAttDecl)
{
QName* otherName = other->getAttName();
@@ -214,7 +217,12 @@
if (serEng.isStoring())
{
serEng<<fElemId;
+ serEng<<(int)fValidity;
+ serEng<<(int)fValidation;
+ serEng<<(int)fPSVIScope;
+
serEng<<fAttName;
+
DatatypeValidator::storeDV(serEng, fDatatypeValidator);
DatatypeValidator::storeDV(serEng, fAnyDatatypeValidator);
DatatypeValidator::storeDV(serEng,
(DatatypeValidator*)fMemberTypeValidator);
@@ -224,25 +232,12 @@
***/
XTemplateSerializer::storeObject(fNamespaceList, serEng);
- serEng<<(int)fValidity;
- serEng<<(int)fValidation;
- serEng<<(int)fPSVIScope;
serEng<<fBaseAttDecl;
}
else
{
serEng>>fElemId;
- serEng>>fAttName;
- fDatatypeValidator = DatatypeValidator::loadDV(serEng);
- fAnyDatatypeValidator = DatatypeValidator::loadDV(serEng);
- fMemberTypeValidator = DatatypeValidator::loadDV(serEng);
-
- /***
- * Deserialize ValueVectorOf<unsigned int>
- ***/
- XTemplateSerializer::loadObject(&fNamespaceList, 8, false, serEng);
-
int i;
serEng>>i;
fValidity = (PSVIDefs::Validity)i;
@@ -252,7 +247,18 @@
serEng>>i;
fPSVIScope = (PSVIDefs::PSVIScope)i;
-
+
+ serEng>>fAttName;
+
+ fDatatypeValidator = DatatypeValidator::loadDV(serEng);
+ fAnyDatatypeValidator = DatatypeValidator::loadDV(serEng);
+ fMemberTypeValidator = DatatypeValidator::loadDV(serEng);
+
+ /***
+ * Deserialize ValueVectorOf<unsigned int>
+ ***/
+ XTemplateSerializer::loadObject(&fNamespaceList, 8, false, serEng);
+
serEng>>fBaseAttDecl;
}
}
1.24 +6 -4 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp
Index: ComplexTypeInfo.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ComplexTypeInfo.hpp 23 Sep 2004 00:37:24 -0000 1.23
+++ ComplexTypeInfo.hpp 28 Oct 2004 20:21:06 -0000 1.24
@@ -203,8 +203,12 @@
int fBlockSet;
int fFinalSet;
int fScopeDefined;
- unsigned int fElementId;
int fContentType;
+
+ unsigned int fElementId;
+ unsigned int fUniqueURI;
+ unsigned int fContentSpecOrgURISize;
+
XMLCh* fTypeName;
XMLCh* fTypeLocalName;
XMLCh* fTypeUri;
@@ -219,8 +223,6 @@
XMLContentModel* fContentModel;
XMLCh* fFormattedModel;
unsigned int* fContentSpecOrgURI;
- unsigned int fUniqueURI;
- unsigned int fContentSpecOrgURISize;
XSDLocator* fLocator;
MemoryManager* fMemoryManager;
1.32 +10 -5 xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp
Index: ComplexTypeInfo.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/ComplexTypeInfo.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ComplexTypeInfo.cpp 20 Oct 2004 15:19:07 -0000 1.31
+++ ComplexTypeInfo.cpp 28 Oct 2004 20:21:06 -0000 1.32
@@ -16,6 +16,9 @@
/*
* $Log$
+ * Revision 1.32 2004/10/28 20:21:06 peiyongz
+ * Data member reshuffle
+ *
* Revision 1.31 2004/10/20 15:19:07 knoaman
* Allow option of initializing static data in XMLPlatformUtils::Initialize
*
@@ -337,8 +340,10 @@
, fBlockSet(0)
, fFinalSet(0)
, fScopeDefined(Grammar::TOP_LEVEL_SCOPE)
- , fElementId(XMLElementDecl::fgInvalidElemId)
, fContentType(SchemaElementDecl::Empty)
+ , fElementId(XMLElementDecl::fgInvalidElemId)
+ , fUniqueURI(0)
+ , fContentSpecOrgURISize(16)
, fTypeName(0)
, fTypeLocalName(0)
, fTypeUri(0)
@@ -353,8 +358,6 @@
, fContentModel(0)
, fFormattedModel(0)
, fContentSpecOrgURI(0)
- , fUniqueURI(0)
- , fContentSpecOrgURISize(16)
, fLocator(0)
, fMemoryManager(manager)
{
@@ -1039,9 +1042,10 @@
serEng<<fBlockSet;
serEng<<fFinalSet;
serEng<<fScopeDefined;
- serEng<<fElementId;
serEng<<fContentType;
+ serEng<<fElementId;
+
serEng.writeString(fTypeName);
serEng.writeString(fTypeLocalName);
serEng.writeString(fTypeUri);
@@ -1085,8 +1089,9 @@
serEng>>fBlockSet;
serEng>>fFinalSet;
serEng>>fScopeDefined;
- serEng>>fElementId;
serEng>>fContentType;
+
+ serEng>>fElementId;
serEng.readString(fTypeName);
serEng.readString(fTypeLocalName);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
