knoaman 2003/01/13 12:16:52
Modified: c/src/xercesc/validators/common ContentSpecNode.cpp
c/src/xercesc/validators/datatype
AnySimpleTypeDatatypeValidator.cpp
c/src/xercesc/validators/schema SchemaSymbols.hpp
SchemaValidator.cpp SchemaValidator.hpp
SubstitutionGroupComparator.cpp TraverseSchema.cpp
TraverseSchema.hpp
c/src/xercesc/validators/schema/identity XPathMatcher.cpp
Log:
[Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
Revision Changes Path
1.6 +7 -7 xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp
Index: ContentSpecNode.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/ContentSpecNode.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ContentSpecNode.cpp 4 Nov 2002 14:54:58 -0000 1.5
+++ ContentSpecNode.cpp 13 Jan 2003 20:16:51 -0000 1.6
@@ -264,8 +264,8 @@
int max = fMaxOccurs;
- if (max == SchemaSymbols::UNBOUNDED) {
- return SchemaSymbols::UNBOUNDED;
+ if (max == SchemaSymbols::XSD_UNBOUNDED) {
+ return SchemaSymbols::XSD_UNBOUNDED;
}
if (fType == ContentSpecNode::Sequence
@@ -274,16 +274,16 @@
int maxFirst = fFirst->getMaxTotalRange();
- if (maxFirst == SchemaSymbols::UNBOUNDED) {
- return SchemaSymbols::UNBOUNDED;
+ if (maxFirst == SchemaSymbols::XSD_UNBOUNDED) {
+ return SchemaSymbols::XSD_UNBOUNDED;
}
if (fSecond) {
int maxSecond = fSecond->getMaxTotalRange();
- if (maxSecond == SchemaSymbols::UNBOUNDED) {
- return SchemaSymbols::UNBOUNDED;
+ if (maxSecond == SchemaSymbols::XSD_UNBOUNDED) {
+ return SchemaSymbols::XSD_UNBOUNDED;
}
else {
1.5 +4 -1
xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp
Index: AnySimpleTypeDatatypeValidator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/datatype/AnySimpleTypeDatatypeValidator.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AnySimpleTypeDatatypeValidator.cpp 18 Dec 2002 14:17:55 -0000 1.4
+++ AnySimpleTypeDatatypeValidator.cpp 13 Jan 2003 20:16:51 -0000 1.5
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.5 2003/01/13 20:16:51 knoaman
+ * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
+ *
* Revision 1.4 2002/12/18 14:17:55 gareth
* Fix to bug #13438. When you eant a vector that calls delete[] on its members you
should use RefArrayVectorOf.
*
@@ -88,7 +91,7 @@
// AnySimpleTypeDatatypeValidator: Constructors and Destructor
// ---------------------------------------------------------------------------
AnySimpleTypeDatatypeValidator::AnySimpleTypeDatatypeValidator()
- : DatatypeValidator(0, 0, SchemaSymbols::RESTRICTION,
DatatypeValidator::AnySimpleType)
+ : DatatypeValidator(0, 0, SchemaSymbols::XSD_RESTRICTION,
DatatypeValidator::AnySimpleType)
{
}
1.5 +15 -15 xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp
Index: SchemaSymbols.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaSymbols.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SchemaSymbols.hpp 4 Nov 2002 14:49:42 -0000 1.4
+++ SchemaSymbols.hpp 13 Jan 2003 20:16:51 -0000 1.5
@@ -249,27 +249,27 @@
static const int fgINT_MAX_VALUE;
enum {
- EMPTY_SET = 0,
- SUBSTITUTION = 1,
- EXTENSION = 2,
- RESTRICTION = 4,
- LIST = 8,
- UNION = 16,
- ENUMERATION = 32
+ XSD_EMPTYSET = 0,
+ XSD_SUBSTITUTION = 1,
+ XSD_EXTENSION = 2,
+ XSD_RESTRICTION = 4,
+ XSD_LIST = 8,
+ XSD_UNION = 16,
+ XSD_ENUMERATION = 32
};
// group orders
enum {
- CHOICE = 0,
- SEQUENCE= 1,
- ALL = 2
+ XSD_CHOICE = 0,
+ XSD_SEQUENCE= 1,
+ XSD_ALL = 2
};
enum {
- UNBOUNDED = -1,
- NILLABLE = 1,
- ABSTRACT = 2,
- FIXED = 4
+ XSD_UNBOUNDED = -1,
+ XSD_NILLABLE = 1,
+ XSD_ABSTRACT = 2,
+ XSD_FIXED = 4
};
};
1.25 +16 -13 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp
Index: SchemaValidator.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- SchemaValidator.cpp 20 Dec 2002 22:10:47 -0000 1.24
+++ SchemaValidator.cpp 13 Jan 2003 20:16:51 -0000 1.25
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.25 2003/01/13 20:16:51 knoaman
+ * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
+ *
* Revision 1.24 2002/12/20 22:10:47 tng
* XML 1.1
*
@@ -458,7 +461,7 @@
else {
// this element has specified some value
// if the flag is FIXED, then this value must be same
as default value
- if ((((SchemaElementDecl*)elemDecl)->getMiscFlags() &
SchemaSymbols::FIXED) != 0) {
+ if ((((SchemaElementDecl*)elemDecl)->getMiscFlags() &
SchemaSymbols::XSD_FIXED) != 0) {
if (fCurrentDV->compare(value, elemDefaultValue) !=
0 )
emitError(XMLValid::FixedDifferentFromActual,
elemDecl->getFullName());
}
@@ -473,7 +476,7 @@
else {
// no default value, then check nillable
if (XMLString::equals(value, XMLUni::fgZeroLenString)) {
- if ((((SchemaElementDecl*)elemDecl)->getMiscFlags() &
SchemaSymbols::NILLABLE) == 0)
+ if ((((SchemaElementDecl*)elemDecl)->getMiscFlags() &
SchemaSymbols::XSD_NILLABLE) == 0)
fCurrentDV->validate(value);
}
else if (fNil) {
@@ -726,7 +729,7 @@
}
else {
// the type is derived from ancestor
- if (((SchemaElementDecl*)elemDef)->getBlockSet() ==
SchemaSymbols::RESTRICTION)
+ if (((SchemaElementDecl*)elemDef)->getBlockSet() ==
SchemaSymbols::XSD_RESTRICTION)
emitError(XMLValid::NoSubforBlock,
fXsiType->getRawName(), elemDef->getFullName());
if (elemDef->hasAttDefs()) {
// if we have an attribute but xsi:type's type is
simple, we have a problem...
@@ -818,7 +821,7 @@
}
else {
// the type is derived from ancestor
- if (((SchemaElementDecl*)elemDef)->getBlockSet() ==
SchemaSymbols::RESTRICTION)
+ if (((SchemaElementDecl*)elemDef)->getBlockSet() ==
SchemaSymbols::XSD_RESTRICTION)
emitError(XMLValid::NoSubforBlock,
fXsiType->getRawName(), elemDef->getFullName());
if (elemDef->hasAttDefs()) {
// if we have an attribute but xsi:type's type
is simple, we have a problem...
@@ -848,14 +851,14 @@
// Check whether this element is abstract. If so, an error
//
int miscFlags = ((SchemaElementDecl*)elemDef)->getMiscFlags();
- if ((miscFlags & SchemaSymbols::ABSTRACT) != 0) {
+ if ((miscFlags & SchemaSymbols::XSD_ABSTRACT) != 0) {
emitError(XMLValid::NoDirectUseAbstractElement, elemDef->getFullName());
}
//
// Check whether this element allows Nillable
//
- if (fNil && (miscFlags & SchemaSymbols::NILLABLE) == 0 ) {
+ if (fNil && (miscFlags & SchemaSymbols::XSD_NILLABLE) == 0 ) {
fNil = false;
emitError(XMLValid::NillNotAllowed, elemDef->getFullName());
}
@@ -1237,7 +1240,7 @@
ComplexTypeInfo* baseTypeInfo = 0;
ContentSpecNode* curSpecNode = 0;
- if (curTypeInfo->getDerivedBy() == SchemaSymbols::RESTRICTION
+ if (curTypeInfo->getDerivedBy() == SchemaSymbols::XSD_RESTRICTION
&& ((baseTypeInfo = curTypeInfo->getBaseComplexTypeInfo()) != 0)
&& ((curSpecNode = curTypeInfo->getContentSpec()) != 0)) {
@@ -1602,16 +1605,16 @@
int derivedFlags = derivedElemDecl->getMiscFlags();
int baseFlags = baseElemDecl->getMiscFlags();
- if (((baseFlags & SchemaSymbols::NILLABLE) == 0) &&
- ((derivedFlags & SchemaSymbols::NILLABLE) != 0)) {
+ if (((baseFlags & SchemaSymbols::XSD_NILLABLE) == 0) &&
+ ((derivedFlags & SchemaSymbols::XSD_NILLABLE) != 0)) {
ThrowXML1(RuntimeException, XMLExcepts::PD_NameTypeOK2, derivedName);
}
const XMLCh* derivedDefVal = derivedElemDecl->getDefaultValue();
const XMLCh* baseDefVal = baseElemDecl->getDefaultValue();
- if (baseDefVal && (baseFlags & SchemaSymbols::FIXED) != 0 &&
- ((derivedFlags & SchemaSymbols::FIXED) == 0 ||
+ if (baseDefVal && (baseFlags & SchemaSymbols::XSD_FIXED) != 0 &&
+ ((derivedFlags & SchemaSymbols::XSD_FIXED) == 0 ||
!XMLString::equals(derivedDefVal, baseDefVal))) {
ThrowXML1(RuntimeException, XMLExcepts::PD_NameTypeOK3, derivedName);
}
@@ -1737,7 +1740,7 @@
return;
for (; rInfo && rInfo != bInfo; rInfo = rInfo->getBaseComplexTypeInfo()) {
- if (rInfo->getDerivedBy() != SchemaSymbols::RESTRICTION) {
+ if (rInfo->getDerivedBy() != SchemaSymbols::XSD_RESTRICTION) {
rInfo = 0;
break;
@@ -2011,7 +2014,7 @@
int derivedMin = derivedSpecNode->getMinOccurs() * derivedCount;
int derivedMax = derivedSpecNode->getMaxOccurs();
- if (derivedMax != SchemaSymbols::UNBOUNDED) {
+ if (derivedMax != SchemaSymbols::XSD_UNBOUNDED) {
derivedMax *= derivedCount;
}
1.12 +5 -2 xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp
Index: SchemaValidator.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/SchemaValidator.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SchemaValidator.hpp 9 Jan 2003 22:34:54 -0000 1.11
+++ SchemaValidator.hpp 13 Jan 2003 20:16:51 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2003/01/13 20:16:51 knoaman
+ * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
+ *
* Revision 1.11 2003/01/09 22:34:54 tng
* [Bug 14955] error validating parser.
*
@@ -454,8 +457,8 @@
const int min2, const int max2) {
if (min1 >= min2 &&
- (max2 == SchemaSymbols::UNBOUNDED ||
- (max1 != SchemaSymbols::UNBOUNDED && max1 <= max2))) {
+ (max2 == SchemaSymbols::XSD_UNBOUNDED ||
+ (max1 != SchemaSymbols::XSD_UNBOUNDED && max1 <= max2))) {
return true;
}
return false;
1.6 +5 -2
xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp
Index: SubstitutionGroupComparator.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/SubstitutionGroupComparator.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SubstitutionGroupComparator.cpp 4 Nov 2002 14:49:42 -0000 1.5
+++ SubstitutionGroupComparator.cpp 13 Jan 2003 20:16:51 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/01/13 20:16:51 knoaman
+ * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
+ *
* Revision 1.5 2002/11/04 14:49:42 tng
* C++ Namespace Support.
*
@@ -173,7 +176,7 @@
(pElemDecl->getURI() == exemplar->getURI()))
{
// time to check for block value on element
- if((pElemDecl->getBlockSet() & SchemaSymbols::SUBSTITUTION) != 0)
+ if((pElemDecl->getBlockSet() & SchemaSymbols::XSD_SUBSTITUTION) != 0)
return false;
foundIt = true;
@@ -198,7 +201,7 @@
return((anElementDV == 0) ||
((anElementDV == exemplarDV) ||
- ((exemplarBlockSet & SchemaSymbols::RESTRICTION) == 0)));
+ ((exemplarBlockSet & SchemaSymbols::XSD_RESTRICTION) == 0)));
}
// now we have to make sure there are no blocks on the complexTypes that this
is based upon
1.52 +46 -46 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp
Index: TraverseSchema.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- TraverseSchema.cpp 7 Jan 2003 15:43:47 -0000 1.51
+++ TraverseSchema.cpp 13 Jan 2003 20:16:51 -0000 1.52
@@ -1043,7 +1043,7 @@
// Remark: some code will be repeated in list|restriction| union but it
// is cleaner that way
if (XMLString::equals(varietyName, SchemaSymbols::fgELT_LIST)) { //traverse
List
- if ((baseRefContext & SchemaSymbols::LIST) != 0) {
+ if ((baseRefContext & SchemaSymbols::XSD_LIST) != 0) {
reportSchemaError(content, XMLUni::fgXMLErrDomain,
XMLErrs::AtomicItemType);
popCurrentTypeNameStack();
@@ -2397,7 +2397,7 @@
if (subsGroupName && *subsGroupName) {
- if (elemDecl->getMiscFlags() & SchemaSymbols::ABSTRACT )
+ if (elemDecl->getMiscFlags() & SchemaSymbols::XSD_ABSTRACT )
{
reportSchemaError
(
@@ -2782,7 +2782,7 @@
}
if (XMLString::equals(content->getLocalName(),
SchemaSymbols::fgELT_SIMPLETYPE)) {
- baseValidator = checkForSimpleTypeValidator(content,
SchemaSymbols::LIST);
+ baseValidator = checkForSimpleTypeValidator(content,
SchemaSymbols::XSD_LIST);
}
else {
@@ -2795,7 +2795,7 @@
}
else { // base was provided - get proper validator
- baseValidator = findDTValidator(contentElem, typeName, baseTypeName,
SchemaSymbols::LIST);
+ baseValidator = findDTValidator(contentElem, typeName, baseTypeName,
SchemaSymbols::XSD_LIST);
content = checkContent(rootElem, XUtil::getFirstChildElement(contentElem),
true);
}
@@ -2880,7 +2880,7 @@
}
else { // base was provided - get proper validator
- baseValidator = findDTValidator(contentElem, typeName, baseTypeName,
SchemaSymbols::RESTRICTION);
+ baseValidator = findDTValidator(contentElem, typeName, baseTypeName,
SchemaSymbols::XSD_RESTRICTION);
content = checkContent(rootElem, XUtil::getFirstChildElement(contentElem),
true);
}
@@ -3050,7 +3050,7 @@
const XMLCh* memberTypeName = unionMembers.nextToken();
- baseValidator = findDTValidator(contentElem, typeName, memberTypeName,
SchemaSymbols::UNION);
+ baseValidator = findDTValidator(contentElem, typeName, memberTypeName,
SchemaSymbols::XSD_UNION);
if (baseValidator == 0) {
@@ -3087,7 +3087,7 @@
if (XMLString::equals(content->getLocalName(),
SchemaSymbols::fgELT_SIMPLETYPE)) {
- baseValidator = checkForSimpleTypeValidator(content, baseRefContext |
SchemaSymbols::UNION);
+ baseValidator = checkForSimpleTypeValidator(content, baseRefContext |
SchemaSymbols::XSD_UNION);
if (baseValidator == 0) {
@@ -3186,12 +3186,12 @@
if (XMLString::equals(contentName, SchemaSymbols::fgATTVAL_RESTRICTION)) {
fAttributeCheck.checkAttributes(simpleContent,
GeneralAttributeCheck::E_Restriction, this);
- typeInfo->setDerivedBy(SchemaSymbols::RESTRICTION);
+ typeInfo->setDerivedBy(SchemaSymbols::XSD_RESTRICTION);
}
else if (XMLString::equals(contentName, SchemaSymbols::fgATTVAL_EXTENSION)) {
fAttributeCheck.checkAttributes(simpleContent,
GeneralAttributeCheck::E_Extension, this);
- typeInfo->setDerivedBy(SchemaSymbols::EXTENSION);
+ typeInfo->setDerivedBy(SchemaSymbols::XSD_EXTENSION);
}
else {
reportSchemaError(simpleContent, XMLUni::fgXMLErrDomain,
XMLErrs::InvalidSimpleContent);
@@ -3217,7 +3217,7 @@
if (baseValidator != 0) {
// check that the simpleType does not preclude derivation by extension
- if ((baseValidator->getFinalSet() & SchemaSymbols::EXTENSION) ==
typeInfo->getDerivedBy()) {
+ if ((baseValidator->getFinalSet() & SchemaSymbols::XSD_EXTENSION) ==
typeInfo->getDerivedBy()) {
reportSchemaError(simpleContent, XMLUni::fgXMLErrDomain,
XMLErrs::DisallowedSimpleTypeExtension,
baseName, typeName);
@@ -3250,7 +3250,7 @@
if (baseTypeInfo->getContentType() != SchemaElementDecl::Simple) {
// Schema Errata: E1-27
- if (typeInfo->getDerivedBy() == SchemaSymbols::RESTRICTION
+ if (typeInfo->getDerivedBy() == SchemaSymbols::XSD_RESTRICTION
&& ((baseTypeInfo->getContentType() ==
SchemaElementDecl::Mixed_Simple
|| baseTypeInfo->getContentType() ==
SchemaElementDecl::Mixed_Complex)
&& emptiableParticle(baseTypeInfo->getContentSpec()))) {
@@ -3274,7 +3274,7 @@
//Skip over any annotations in the restriction or extension elements
DOMElement* content = checkContent(simpleContent,
XUtil::getFirstChildElement(simpleContent), true);
- if (typeInfo->getDerivedBy() == SchemaSymbols::RESTRICTION) {
+ if (typeInfo->getDerivedBy() == SchemaSymbols::XSD_RESTRICTION) {
//Schema Spec: 5.11: Complex Type Definition Properties Correct: 2
if (typeInfo->getBaseDatatypeValidator() != 0) {
@@ -3553,10 +3553,10 @@
const XMLCh* const complexContentName = complexContent->getLocalName();
if (XMLString::equals(complexContentName, SchemaSymbols::fgELT_RESTRICTION)) {
- typeInfo->setDerivedBy(SchemaSymbols::RESTRICTION);
+ typeInfo->setDerivedBy(SchemaSymbols::XSD_RESTRICTION);
}
else if (XMLString::equals(complexContentName, SchemaSymbols::fgELT_EXTENSION))
{
- typeInfo->setDerivedBy(SchemaSymbols::EXTENSION);
+ typeInfo->setDerivedBy(SchemaSymbols::XSD_EXTENSION);
}
else {
@@ -4569,7 +4569,7 @@
if (XMLString::equals(blockVal, SchemaSymbols::fgATTVAL_POUNDALL)) {
- blockSet = SchemaSymbols::EXTENSION + SchemaSymbols::RESTRICTION +
SchemaSymbols::SUBSTITUTION;
+ blockSet = SchemaSymbols::XSD_EXTENSION + SchemaSymbols::XSD_RESTRICTION +
SchemaSymbols::XSD_SUBSTITUTION;
return blockSet;
}
@@ -4582,8 +4582,8 @@
if (XMLString::equals(token, SchemaSymbols::fgATTVAL_SUBSTITUTION)
&& blockType == ES_Block) {
- if ((blockSet & SchemaSymbols::SUBSTITUTION) == 0 ) {
- blockSet += SchemaSymbols::SUBSTITUTION;
+ if ((blockSet & SchemaSymbols::XSD_SUBSTITUTION) == 0 ) {
+ blockSet += SchemaSymbols::XSD_SUBSTITUTION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::SubstitutionRepeated);
@@ -4591,8 +4591,8 @@
}
else if (XMLString::equals(token, SchemaSymbols::fgATTVAL_EXTENSION)) {
- if ((blockSet & SchemaSymbols::EXTENSION) == 0) {
- blockSet += SchemaSymbols::EXTENSION;
+ if ((blockSet & SchemaSymbols::XSD_EXTENSION) == 0) {
+ blockSet += SchemaSymbols::XSD_EXTENSION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::ExtensionRepeated);
@@ -4600,8 +4600,8 @@
}
else if (XMLString::equals(token, SchemaSymbols::fgATTVAL_RESTRICTION)) {
- if ((blockSet & SchemaSymbols::RESTRICTION) == 0 ) {
- blockSet += SchemaSymbols::RESTRICTION;
+ if ((blockSet & SchemaSymbols::XSD_RESTRICTION) == 0 ) {
+ blockSet += SchemaSymbols::XSD_RESTRICTION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::RestrictionRepeated);
@@ -4629,8 +4629,8 @@
if (XMLString::equals(finalVal, SchemaSymbols::fgATTVAL_POUNDALL)) {
- finalSet = SchemaSymbols::RESTRICTION + SchemaSymbols::LIST +
- SchemaSymbols::UNION + SchemaSymbols::EXTENSION;
+ finalSet = SchemaSymbols::XSD_RESTRICTION + SchemaSymbols::XSD_LIST +
+ SchemaSymbols::XSD_UNION + SchemaSymbols::XSD_EXTENSION;
return finalSet;
}
@@ -4643,8 +4643,8 @@
if (XMLString::equals(token, SchemaSymbols::fgELT_UNION)
&& finalType == S_Final) {
- if ((finalSet & SchemaSymbols::UNION) == 0) {
- finalSet += SchemaSymbols::UNION;
+ if ((finalSet & SchemaSymbols::XSD_UNION) == 0) {
+ finalSet += SchemaSymbols::XSD_UNION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::UnionRepeated);
@@ -4653,8 +4653,8 @@
else if (XMLString::equals(token, SchemaSymbols::fgATTVAL_EXTENSION)
&& finalType != S_Final) {
- if ((finalSet & SchemaSymbols::EXTENSION) == 0) {
- finalSet += SchemaSymbols::EXTENSION;
+ if ((finalSet & SchemaSymbols::XSD_EXTENSION) == 0) {
+ finalSet += SchemaSymbols::XSD_EXTENSION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::ExtensionRepeated);
@@ -4663,8 +4663,8 @@
else if (XMLString::equals(token, SchemaSymbols::fgELT_LIST)
&& finalType == S_Final) {
- if ((finalSet & SchemaSymbols::LIST) == 0 ) {
- finalSet += SchemaSymbols::LIST;
+ if ((finalSet & SchemaSymbols::XSD_LIST) == 0 ) {
+ finalSet += SchemaSymbols::XSD_LIST;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::ListRepeated);
@@ -4672,8 +4672,8 @@
}
else if (XMLString::equals(token, SchemaSymbols::fgATTVAL_RESTRICTION)) {
- if ((finalSet & SchemaSymbols::RESTRICTION) == 0 ) {
- finalSet += SchemaSymbols::RESTRICTION;
+ if ((finalSet & SchemaSymbols::XSD_RESTRICTION) == 0 ) {
+ finalSet += SchemaSymbols::XSD_RESTRICTION;
}
else {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::RestrictionRepeated);
@@ -5055,7 +5055,7 @@
DatatypeValidator* subsValidator = subsElemDecl->getDatatypeValidator();
if (subsValidator && subsValidator->isSubstitutableBy(validator)
- && ((subsElemDecl->getFinalSet() & SchemaSymbols::RESTRICTION) == 0)) {
+ && ((subsElemDecl->getFinalSet() & SchemaSymbols::XSD_RESTRICTION) ==
0)) {
return true;
}
}
@@ -5119,7 +5119,7 @@
if (XMLString::equals(nillable, SchemaSymbols::fgATTVAL_TRUE)
|| XMLString::equals(nillable, fgValueOne)) {
- elementMiscFlags += SchemaSymbols::NILLABLE;
+ elementMiscFlags += SchemaSymbols::XSD_NILLABLE;
}
}
@@ -5127,12 +5127,12 @@
if (XMLString::equals(abstract, SchemaSymbols::fgATTVAL_TRUE)
|| XMLString::equals(abstract, fgValueOne)) {
- elementMiscFlags += SchemaSymbols::ABSTRACT;
+ elementMiscFlags += SchemaSymbols::XSD_ABSTRACT;
}
}
if (isFixedVal) {
- elementMiscFlags += SchemaSymbols::FIXED;
+ elementMiscFlags += SchemaSymbols::XSD_FIXED;
}
const XMLCh* prefix = getPrefix(name);
@@ -5395,7 +5395,7 @@
bool isMaxUnbounded = XMLString::equals(maxOccursStr, fgUnbounded);
if (isMaxUnbounded) {
- maxOccurs = SchemaSymbols::UNBOUNDED;
+ maxOccurs = SchemaSymbols::XSD_UNBOUNDED;
if (specNode)
specNode->setMaxOccurs(maxOccurs);
}
@@ -5492,7 +5492,7 @@
if (baseTypeInfo) {
- if (typeDerivedBy == SchemaSymbols::RESTRICTION) {
+ if (typeDerivedBy == SchemaSymbols::XSD_RESTRICTION) {
// check to see if the baseType permits derivation by restriction
if((baseTypeInfo->getFinalSet() & typeDerivedBy) != 0) {
@@ -5525,7 +5525,7 @@
processElements(ctElem, baseTypeInfo, typeInfo);
}
}
- else if (isBaseAnyType && typeDerivedBy == SchemaSymbols::EXTENSION &&
!isMixed) {
+ else if (isBaseAnyType && typeDerivedBy == SchemaSymbols::XSD_EXTENSION &&
!isMixed) {
reportSchemaError(ctElem, XMLUni::fgXMLErrDomain,
XMLErrs::MixedOrElementOnly, baseLocalPart, typeName);
throw TraverseSchema::InvalidComplexTypeInfo; //REVISIT - should we continue
@@ -5599,7 +5599,7 @@
ContentSpecNode* baseSpecNode = baseTypeInfo->getContentSpec();
- if (typeDerivedBy == SchemaSymbols::RESTRICTION) {
+ if (typeDerivedBy == SchemaSymbols::XSD_RESTRICTION) {
//check derivation valid - content type is empty (5.2)
if (!typeInfo->getContentSpec()) {
@@ -5649,7 +5649,7 @@
// -------------------------------------------------------------
// Set the content type
// -------------------------------------------------------------
- if (isBaseAnyType && typeDerivedBy == SchemaSymbols::EXTENSION) {
+ if (isBaseAnyType && typeDerivedBy == SchemaSymbols::XSD_EXTENSION) {
ContentSpecNode* anySpecNode = new ContentSpecNode(new
QName(XMLUni::fgZeroLenString,
XMLUni::fgZeroLenString,
@@ -5658,7 +5658,7 @@
anySpecNode->setType(ContentSpecNode::Any_Lax);
anySpecNode->setMinOccurs(0);
- anySpecNode->setMaxOccurs(SchemaSymbols::UNBOUNDED);
+ anySpecNode->setMaxOccurs(SchemaSymbols::XSD_UNBOUNDED);
if (!specNode) {
typeInfo->setContentSpec(anySpecNode);
@@ -5988,7 +5988,7 @@
SchemaAttDef* baseAttWildCard = (baseTypeInfo) ? baseTypeInfo->getAttWildCard()
: 0;
Janitor<SchemaAttDef> janBaseAttWildCard(0);
- if (derivedBy == SchemaSymbols::EXTENSION) {
+ if (derivedBy == SchemaSymbols::XSD_EXTENSION) {
if (isBaseAnyType) {
@@ -6019,7 +6019,7 @@
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::NotExpressibleWildCardIntersection);
}
}
- else if (baseAttWildCard && derivedBy == SchemaSymbols::EXTENSION) {
+ else if (baseAttWildCard && derivedBy == SchemaSymbols::XSD_EXTENSION) {
if (isBaseAnyType) {
@@ -6039,7 +6039,7 @@
bool baseWithAttributes = (baseTypeInfo && baseTypeInfo->hasAttDefs());
bool childWithAttributes = (typeInfo->hasAttDefs() ||
typeInfo->getAttWildCard());
- if (derivedBy == SchemaSymbols::RESTRICTION && childWithAttributes) {
+ if (derivedBy == SchemaSymbols::XSD_RESTRICTION && childWithAttributes) {
if (!baseWithAttributes && !baseAttWildCard) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::BadAttDerivation_1);
@@ -6066,7 +6066,7 @@
// if found a duplicate, then skip the one from the base type
if (typeInfo->getAttDef(localPart, attName->getURI()) != 0) {
- if (derivedBy == SchemaSymbols::EXTENSION) {
+ if (derivedBy == SchemaSymbols::XSD_EXTENSION) {
reportSchemaError(elem, XMLUni::fgXMLErrDomain,
XMLErrs::DuplicateAttInDerivation, localPart);
}
1.20 +3 -3 xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp
Index: TraverseSchema.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/schema/TraverseSchema.hpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- TraverseSchema.hpp 3 Jan 2003 16:38:21 -0000 1.19
+++ TraverseSchema.hpp 13 Jan 2003 20:16:52 -0000 1.20
@@ -187,7 +187,7 @@
const bool isMixed);
DatatypeValidator* traverseSimpleTypeDecl(const DOMElement* const childElem,
const bool topLevel = true,
- int baseRefContext =
SchemaSymbols::EMPTY_SET);
+ int baseRefContext =
SchemaSymbols::XSD_EMPTYSET);
int traverseComplexTypeDecl(const DOMElement* const childElem,
const bool topLevel = true,
const XMLCh* const
recursingTypeName = 0);
@@ -309,7 +309,7 @@
* Return a dataype validator if valid type, otherwise 0.
*/
DatatypeValidator* checkForSimpleTypeValidator(const DOMElement* const content,
- int baseRefContext =
SchemaSymbols::EMPTY_SET);
+ int baseRefContext =
SchemaSymbols::XSD_EMPTYSET);
/**
* Process complexType content of an element
1.6 +4 -1
xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp
Index: XPathMatcher.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/validators/schema/identity/XPathMatcher.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPathMatcher.cpp 13 Jan 2003 16:30:19 -0000 1.5
+++ XPathMatcher.cpp 13 Jan 2003 20:16:52 -0000 1.6
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.6 2003/01/13 20:16:52 knoaman
+ * [Bug 16024] SchemaSymbols.hpp conflicts C++ Builder 6 dir.h
+ *
* Revision 1.5 2003/01/13 16:30:19 knoaman
* [Bug 14469] Validator doesn't enforce xsd:key.
*
@@ -348,7 +351,7 @@
continue;
DatatypeValidator* dv = ((SchemaElementDecl*)
&elemDecl)->getDatatypeValidator();
- bool isNillable = (((SchemaElementDecl *) &elemDecl)->getMiscFlags() &
SchemaSymbols::NILLABLE) != 0;
+ bool isNillable = (((SchemaElementDecl *) &elemDecl)->getMiscFlags() &
SchemaSymbols::XSD_NILLABLE) != 0;
matched(elemContent, dv, isNillable);
fMatched[i] = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
