You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by kn...@apache.org on 2001/11/02 15:21:18 UTC
cvs commit: xml-xerces/c/src/framework XMLAttr.hpp XMLErrorCodes.hpp XMLValidityCodes.hpp
knoaman 01/11/02 06:21:18
Modified: c/src/framework XMLAttr.hpp XMLErrorCodes.hpp
XMLValidityCodes.hpp
Log:
Add support for identity constraints.
Revision Changes Path
1.9 +13 -0 xml-xerces/c/src/framework/XMLAttr.hpp
Index: XMLAttr.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLAttr.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLAttr.hpp 2001/05/11 13:25:31 1.8
+++ XMLAttr.hpp 2001/11/02 14:21:18 1.9
@@ -56,6 +56,9 @@
/*
* $Log: XMLAttr.hpp,v $
+ * Revision 1.9 2001/11/02 14:21:18 knoaman
+ * Add support for identity constraints.
+ *
* Revision 1.8 2001/05/11 13:25:31 tng
* Copyright update.
*
@@ -184,6 +187,11 @@
//@{
/**
+ * This methode returns the attribute name in a QName format.
+ */
+ QName* getAttName() const;
+
+ /**
* This method gets a const pointer tot he name of the attribute. The
* form of this name is defined by the validator in use.
*/
@@ -386,6 +394,11 @@
// ---------------------------------------------------------------------------
// XMLAttr: Getter methods
// ---------------------------------------------------------------------------
+inline QName* XMLAttr::getAttName() const
+{
+ return fAttName;
+}
+
inline const XMLCh* XMLAttr::getName() const
{
return fAttName->getLocalPart();
1.24 +134 -129 xml-xerces/c/src/framework/XMLErrorCodes.hpp
Index: XMLErrorCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLErrorCodes.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLErrorCodes.hpp 2001/10/15 19:37:53 1.23
+++ XMLErrorCodes.hpp 2001/11/02 14:21:18 1.24
@@ -152,135 +152,140 @@
, Redefine_AttGroupRefCount = 139
, Notation_InvalidDecl = 140
, Notation_DeclNotFound = 141
- , DisplayErrorMessage = 142
- , E_HighBounds = 143
- , F_LowBounds = 144
- , ExpectedCommentOrCDATA = 145
- , ExpectedAttrName = 146
- , ExpectedNotationName = 147
- , NoRepInMixed = 148
- , BadDefAttrDecl = 149
- , ExpectedDefAttrDecl = 150
- , AttListSyntaxError = 151
- , ExpectedEqSign = 152
- , DupAttrName = 153
- , BadIdForXMLLangAttr = 154
- , ExpectedElementName = 155
- , MustStartWithXMLDecl = 156
- , CommentsMustStartWith = 157
- , InvalidDocumentStructure = 158
- , ExpectedDeclString = 159
- , BadXMLVersion = 160
- , UnsupportedXMLVersion = 161
- , UnterminatedXMLDecl = 162
- , BadXMLEncoding = 163
- , BadStandalone = 164
- , UnterminatedComment = 165
- , PINameExpected = 166
- , UnterminatedPI = 167
- , InvalidCharacter = 168
- , UnexpectedTextBeforeRoot = 169
- , UnterminatedStartTag = 170
- , ExpectedAttrValue = 171
- , UnterminatedEndTag = 172
- , ExpectedAttributeType = 173
- , ExpectedEndOfTagX = 174
- , ExpectedMarkup = 175
- , NotValidAfterContent = 176
- , ExpectedComment = 177
- , ExpectedCommentOrPI = 178
- , ExpectedWhitespace = 179
- , NoRootElemInDOCTYPE = 180
- , ExpectedQuotedString = 181
- , ExpectedPublicId = 182
- , InvalidPublicIdChar = 183
- , UnterminatedDOCTYPE = 184
- , InvalidCharacterInIntSubset = 185
- , ExpectedCDATA = 186
- , InvalidInitialNameChar = 187
- , InvalidNameChar = 188
- , UnexpectedWhitespace = 189
- , InvalidCharacterInAttrValue = 190
- , ExpectedMarkupDecl = 191
- , TextDeclNotLegalHere = 192
- , ConditionalSectInIntSubset = 193
- , ExpectedPEName = 194
- , UnterminatedEntityDecl = 195
- , InvalidCharacterRef = 196
- , UnterminatedCharRef = 197
- , ExpectedEntityRefName = 198
- , EntityNotFound = 199
- , NoUnparsedEntityRefs = 200
- , UnterminatedEntityRef = 201
- , RecursiveEntity = 202
- , PartialMarkupInEntity = 203
- , UnterminatedElementDecl = 204
- , ExpectedContentSpecExpr = 205
- , ExpectedAsterisk = 206
- , UnterminatedContentModel = 207
- , ExpectedSystemId = 208
- , ExpectedSystemOrPublicId = 209
- , UnterminatedNotationDecl = 210
- , ExpectedSeqChoiceLeaf = 211
- , ExpectedChoiceOrCloseParen = 212
- , ExpectedSeqOrCloseParen = 213
- , ExpectedEnumValue = 214
- , ExpectedEnumSepOrParen = 215
- , UnterminatedEntityLiteral = 216
- , MoreEndThanStartTags = 217
- , ExpectedOpenParen = 218
- , AttrAlreadyUsedInSTag = 219
- , BracketInAttrValue = 220
- , Expected2ndSurrogateChar = 221
- , ExpectedEndOfConditional = 222
- , ExpectedIncOrIgn = 223
- , ExpectedINCLUDEBracket = 224
- , ExpectedTextDecl = 225
- , ExpectedXMLDecl = 226
- , UnexpectedEOE = 227
- , PEPropogated = 228
- , ExtraCloseSquare = 229
- , PERefInMarkupInIntSubset = 230
- , EntityPropogated = 231
- , ExpectedNumericalCharRef = 232
- , ExpectedOpenSquareBracket = 233
- , BadSequenceInCharData = 234
- , IllegalSequenceInComment = 235
- , UnterminatedCDATASection = 236
- , ExpectedNDATA = 237
- , NDATANotValidForPE = 238
- , HexRadixMustBeLowerCase = 239
- , DeclStringRep = 240
- , DeclStringsInWrongOrder = 241
- , NoExtRefsInAttValue = 242
- , XMLDeclMustBeLowerCase = 243
- , ExpectedEntityValue = 244
- , BadDigitForRadix = 245
- , EndedWithTagsOnStack = 246
- , AmbiguousContentModel = 247
- , NestedCDATA = 248
- , UnknownPrefix = 249
- , PartialTagMarkupError = 250
- , EmptyMainEntity = 251
- , CDATAOutsideOfContent = 252
- , OnlyCharRefsAllowedHere = 253
- , Unexpected2ndSurrogateChar = 254
- , NoPIStartsWithXML = 255
- , XMLDeclMustBeFirst = 256
- , XMLVersionRequired = 257
- , StandaloneNotLegal = 258
- , EncodingRequired = 259
- , TooManyColonsInName = 260
- , InvalidColonPos = 261
- , ColonNotLegalWithNS = 262
- , SysException = 263
- , XMLException = 264
- , UnexpectedEOF = 265
- , UnexpectedError = 266
- , BadSchemaLocation = 267
- , NoGrammarResolver = 268
- , SchemaScanFatalError = 269
- , F_HighBounds = 270
+ , IC_DuplicateDecl = 142
+ , IC_BadContent = 143
+ , IC_KeyRefReferNotFound = 144
+ , IC_KeyRefCardinality = 145
+ , IC_XPathExprMissing = 146
+ , DisplayErrorMessage = 147
+ , E_HighBounds = 148
+ , F_LowBounds = 149
+ , ExpectedCommentOrCDATA = 150
+ , ExpectedAttrName = 151
+ , ExpectedNotationName = 152
+ , NoRepInMixed = 153
+ , BadDefAttrDecl = 154
+ , ExpectedDefAttrDecl = 155
+ , AttListSyntaxError = 156
+ , ExpectedEqSign = 157
+ , DupAttrName = 158
+ , BadIdForXMLLangAttr = 159
+ , ExpectedElementName = 160
+ , MustStartWithXMLDecl = 161
+ , CommentsMustStartWith = 162
+ , InvalidDocumentStructure = 163
+ , ExpectedDeclString = 164
+ , BadXMLVersion = 165
+ , UnsupportedXMLVersion = 166
+ , UnterminatedXMLDecl = 167
+ , BadXMLEncoding = 168
+ , BadStandalone = 169
+ , UnterminatedComment = 170
+ , PINameExpected = 171
+ , UnterminatedPI = 172
+ , InvalidCharacter = 173
+ , UnexpectedTextBeforeRoot = 174
+ , UnterminatedStartTag = 175
+ , ExpectedAttrValue = 176
+ , UnterminatedEndTag = 177
+ , ExpectedAttributeType = 178
+ , ExpectedEndOfTagX = 179
+ , ExpectedMarkup = 180
+ , NotValidAfterContent = 181
+ , ExpectedComment = 182
+ , ExpectedCommentOrPI = 183
+ , ExpectedWhitespace = 184
+ , NoRootElemInDOCTYPE = 185
+ , ExpectedQuotedString = 186
+ , ExpectedPublicId = 187
+ , InvalidPublicIdChar = 188
+ , UnterminatedDOCTYPE = 189
+ , InvalidCharacterInIntSubset = 190
+ , ExpectedCDATA = 191
+ , InvalidInitialNameChar = 192
+ , InvalidNameChar = 193
+ , UnexpectedWhitespace = 194
+ , InvalidCharacterInAttrValue = 195
+ , ExpectedMarkupDecl = 196
+ , TextDeclNotLegalHere = 197
+ , ConditionalSectInIntSubset = 198
+ , ExpectedPEName = 199
+ , UnterminatedEntityDecl = 200
+ , InvalidCharacterRef = 201
+ , UnterminatedCharRef = 202
+ , ExpectedEntityRefName = 203
+ , EntityNotFound = 204
+ , NoUnparsedEntityRefs = 205
+ , UnterminatedEntityRef = 206
+ , RecursiveEntity = 207
+ , PartialMarkupInEntity = 208
+ , UnterminatedElementDecl = 209
+ , ExpectedContentSpecExpr = 210
+ , ExpectedAsterisk = 211
+ , UnterminatedContentModel = 212
+ , ExpectedSystemId = 213
+ , ExpectedSystemOrPublicId = 214
+ , UnterminatedNotationDecl = 215
+ , ExpectedSeqChoiceLeaf = 216
+ , ExpectedChoiceOrCloseParen = 217
+ , ExpectedSeqOrCloseParen = 218
+ , ExpectedEnumValue = 219
+ , ExpectedEnumSepOrParen = 220
+ , UnterminatedEntityLiteral = 221
+ , MoreEndThanStartTags = 222
+ , ExpectedOpenParen = 223
+ , AttrAlreadyUsedInSTag = 224
+ , BracketInAttrValue = 225
+ , Expected2ndSurrogateChar = 226
+ , ExpectedEndOfConditional = 227
+ , ExpectedIncOrIgn = 228
+ , ExpectedINCLUDEBracket = 229
+ , ExpectedTextDecl = 230
+ , ExpectedXMLDecl = 231
+ , UnexpectedEOE = 232
+ , PEPropogated = 233
+ , ExtraCloseSquare = 234
+ , PERefInMarkupInIntSubset = 235
+ , EntityPropogated = 236
+ , ExpectedNumericalCharRef = 237
+ , ExpectedOpenSquareBracket = 238
+ , BadSequenceInCharData = 239
+ , IllegalSequenceInComment = 240
+ , UnterminatedCDATASection = 241
+ , ExpectedNDATA = 242
+ , NDATANotValidForPE = 243
+ , HexRadixMustBeLowerCase = 244
+ , DeclStringRep = 245
+ , DeclStringsInWrongOrder = 246
+ , NoExtRefsInAttValue = 247
+ , XMLDeclMustBeLowerCase = 248
+ , ExpectedEntityValue = 249
+ , BadDigitForRadix = 250
+ , EndedWithTagsOnStack = 251
+ , AmbiguousContentModel = 252
+ , NestedCDATA = 253
+ , UnknownPrefix = 254
+ , PartialTagMarkupError = 255
+ , EmptyMainEntity = 256
+ , CDATAOutsideOfContent = 257
+ , OnlyCharRefsAllowedHere = 258
+ , Unexpected2ndSurrogateChar = 259
+ , NoPIStartsWithXML = 260
+ , XMLDeclMustBeFirst = 261
+ , XMLVersionRequired = 262
+ , StandaloneNotLegal = 263
+ , EncodingRequired = 264
+ , TooManyColonsInName = 265
+ , InvalidColonPos = 266
+ , ColonNotLegalWithNS = 267
+ , SysException = 268
+ , XMLException = 269
+ , UnexpectedEOF = 270
+ , UnexpectedError = 271
+ , BadSchemaLocation = 272
+ , NoGrammarResolver = 273
+ , SchemaScanFatalError = 274
+ , F_HighBounds = 275
};
static bool isFatal(const XMLErrs::Codes toCheck)
1.16 +16 -5 xml-xerces/c/src/framework/XMLValidityCodes.hpp
Index: XMLValidityCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/framework/XMLValidityCodes.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XMLValidityCodes.hpp 2001/10/12 20:52:17 1.15
+++ XMLValidityCodes.hpp 2001/11/02 14:21:18 1.16
@@ -106,11 +106,22 @@
, NoSubforBlock = 93
, AttributeNotQualified = 94
, AttributeNotUnQualified = 95
- , E_HighBounds = 96
- , W_LowBounds = 97
- , W_HighBounds = 98
- , F_LowBounds = 99
- , F_HighBounds = 100
+ , IC_FieldMultipleMatch = 96
+ , IC_UnknownField = 97
+ , IC_AbsentKeyValue = 98
+ , IC_UniqueNotEnoughValues = 99
+ , IC_KeyNotEnoughValues = 100
+ , IC_KeyRefNotEnoughValues = 101
+ , IC_KeyMatchesNillable = 102
+ , IC_DuplicateUnique = 103
+ , IC_DuplicateKey = 104
+ , IC_KeyRefOutOfScope = 105
+ , IC_KeyNotFound = 106
+ , E_HighBounds = 107
+ , W_LowBounds = 108
+ , W_HighBounds = 109
+ , F_LowBounds = 110
+ , F_HighBounds = 111
};
static bool isFatal(const XMLValid::Codes toCheck)
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org