Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Musing over error reporting. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | wip |
| Files: | files | file ages | folders |
| SHA3-256: |
900e627f9a11a0b0ff05466296d7a248 |
| User & Date: | rolf 2019-07-08 21:45:16 |
Context
|
2019-07-08
| ||
| 21:45 | Musing over error reporting. Closed-Leaf check-in: 900e627f9a user: rolf tags: wip | |
|
2019-06-18
| ||
| 22:18 | An example of different 'styles' of a certain type: The 'interger' text constraint now has two interpretation of an integer - what Tcl_GetInt() accept and what a valid xsd:integer is, which is quite different. check-in: 9a589897fb user: rolf tags: schema | |
Changes
Changes to generic/schema.c.
888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 ... 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 .... 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 .... 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 .... 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 .... 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 |
while (ac < cp->nc) {
candidate = cp->content[ac];
mayskip = 0;
switch (candidate->type) {
case SCHEMA_CTYPE_TEXT:
if (candidate->nc) {
if (!checkText (interp, candidate, "")) {
if (recover (interp, sdata, S("MISSING_TEXT"))) {
mayskip = 1;
break;
}
return 0;
}
}
break;
................................................................................
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE_END:
candidate->keySpace->active--;
if (!candidate->keySpace->active) {
if (candidate->keySpace->unknownIDrefs) {
if (!recover (interp, sdata, S("UNKNOWN_KEYREF"))) {
return 0;
}
candidate->keySpace->unknownIDrefs = 0;
}
Tcl_DeleteHashTable (&candidate->keySpace->ids);
}
ac++;
................................................................................
candidate->keySpace->active++;
}
ac++;
hm = 0;
continue;
}
if (!mayskip && mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, S("MISSING_CP"))) {
/* Skip the just opened element tag and the following
* content of the current. */
sdata->skipDeep = 2;
return 1;
}
return 0;
}
ac++;
hm = 0;
}
if (isName) {
if (recover (interp, sdata, "UNEXPECTED_ELEMENT", 15)) {
/* Skip the just opened element tag and the following
* content of the current. */
sdata->skipDeep = 2;
return 1;
}
return 0;
}
................................................................................
break;
}
}
if (mayskip) break;
if (recover (interp, sdata, S("UNCOMPLET_CP"))) {
sdata->skipDeep = 2;
return 1;
}
}
return -1;
}
................................................................................
}
if (sdata->stack) {
SchemaValidationStack *se;
se = sdata->stack;
if (se->pattern->type == SCHEMA_CTYPE_NAME
&& se->activeChild >= se->pattern->nc) {
if (recover (interp, sdata, S("UNEXPECTED_ELEMENT"))) {
sdata->skipDeep = 1;
return TCL_OK;
}
SetResult ("Unexpected child element \"");
if (namespacePtr) {
Tcl_AppendResult (interp, namespacePtr, ":", NULL);
}
................................................................................
Tcl_AppendResult (interp, namespace, ":", NULL);
}
Tcl_AppendResult (interp, name, "\"", NULL);
return TCL_ERROR;
}
} else {
if (!pattern) {
if (recover (interp, sdata, S("UNKNOWN_ROOT_ELEMENT"))) {
sdata->skipDeep = 1;
return TCL_OK;
}
SetResult ("Unknown element");
return TCL_ERROR;
}
pushToStack (sdata, pattern);
|
| > | > | | | > | > | |
888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 ... 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 .... 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 .... 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 .... 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 .... 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 |
while (ac < cp->nc) {
candidate = cp->content[ac];
mayskip = 0;
switch (candidate->type) {
case SCHEMA_CTYPE_TEXT:
if (candidate->nc) {
if (!checkText (interp, candidate, "")) {
if (recover (interp, sdata, S("MATCH_ELEMENT "
"MISSING_TEXT"))) {
mayskip = 1;
break;
}
return 0;
}
}
break;
................................................................................
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE_END:
candidate->keySpace->active--;
if (!candidate->keySpace->active) {
if (candidate->keySpace->unknownIDrefs) {
if (!recover (interp, sdata, S("MATCH_ELEMENT "
"UNKNOWN_KEYREF"))) {
return 0;
}
candidate->keySpace->unknownIDrefs = 0;
}
Tcl_DeleteHashTable (&candidate->keySpace->ids);
}
ac++;
................................................................................
candidate->keySpace->active++;
}
ac++;
hm = 0;
continue;
}
if (!mayskip && mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, S("MATCH_ELEMENT MISSING_CP"))) {
/* Skip the just opened element tag and the following
* content of the current. */
sdata->skipDeep = 2;
return 1;
}
return 0;
}
ac++;
hm = 0;
}
if (isName) {
if (recover (interp, sdata, "MATCH_ELEMENT UNEXPECTED_ELEMENT", 15)) {
/* Skip the just opened element tag and the following
* content of the current. */
sdata->skipDeep = 2;
return 1;
}
return 0;
}
................................................................................
break;
}
}
if (mayskip) break;
if (recover (interp, sdata, S("MATCH_ELEMENT UNCOMPLET_CP"))) {
sdata->skipDeep = 2;
return 1;
}
}
return -1;
}
................................................................................
}
if (sdata->stack) {
SchemaValidationStack *se;
se = sdata->stack;
if (se->pattern->type == SCHEMA_CTYPE_NAME
&& se->activeChild >= se->pattern->nc) {
if (recover (interp, sdata, S("MATCH_ELEMENT "
"UNEXPECTED_ELEMENT"))) {
sdata->skipDeep = 1;
return TCL_OK;
}
SetResult ("Unexpected child element \"");
if (namespacePtr) {
Tcl_AppendResult (interp, namespacePtr, ":", NULL);
}
................................................................................
Tcl_AppendResult (interp, namespace, ":", NULL);
}
Tcl_AppendResult (interp, name, "\"", NULL);
return TCL_ERROR;
}
} else {
if (!pattern) {
if (recover (interp, sdata, S("MATCH_ELEMENT "
"UNKNOWN_ROOT_ELEMENT"))) {
sdata->skipDeep = 1;
return TCL_OK;
}
SetResult ("Unknown element");
return TCL_ERROR;
}
pushToStack (sdata, pattern);
|