You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2007/01/30 17:50:32 UTC
svn commit: r501463 -
/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Author: amassari
Date: Tue Jan 30 08:50:31 2007
New Revision: 501463
URL: http://svn.apache.org/viewvc?view=rev&rev=501463
Log:
Allow 'list' and 'union' in the finalDefault attribute of a schema (XERCESC-1633)
Modified:
xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
Modified: xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp
URL: http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp?view=diff&rev=501463&r1=501462&r2=501463
==============================================================================
--- xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp (original)
+++ xerces/c/trunk/src/xercesc/validators/schema/TraverseSchema.cpp Tue Jan 30 08:50:31 2007
@@ -5158,7 +5158,7 @@
XMLCh* token = tokenizer.nextToken();
if (XMLString::equals(token, SchemaSymbols::fgELT_UNION)
- && finalType == S_Final) {
+ && (finalType == S_Final || finalType == ECS_Final)) {
if ((finalSet & SchemaSymbols::XSD_UNION) == 0) {
finalSet += SchemaSymbols::XSD_UNION;
@@ -5168,7 +5168,7 @@
}
}
else if (XMLString::equals(token, SchemaSymbols::fgATTVAL_EXTENSION)
- && finalType != S_Final) {
+ && (finalType == EC_Final || finalType == ECS_Final)) {
if ((finalSet & SchemaSymbols::XSD_EXTENSION) == 0) {
finalSet += SchemaSymbols::XSD_EXTENSION;
@@ -5178,7 +5178,7 @@
}
}
else if (XMLString::equals(token, SchemaSymbols::fgELT_LIST)
- && finalType == S_Final) {
+ && (finalType == S_Final || finalType == ECS_Final)) {
if ((finalSet & SchemaSymbols::XSD_LIST) == 0 ) {
finalSet += SchemaSymbols::XSD_LIST;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org