Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Added (so far simplistic) validation error recovering with error reporting via tcl callback. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | schema |
Files: | files | file ages | folders |
SHA3-256: |
cd6dce16a16b309e8384b356bdff1f18 |
User & Date: | rolf 2019-04-21 23:06:51.315 |
Context
2019-04-27
| ||
00:33 | Prepare for more converters to come. check-in: fd2f1e3238 user: rolf tags: schema | |
2019-04-21
| ||
23:06 | Added (so far simplistic) validation error recovering with error reporting via tcl callback. check-in: cd6dce16a1 user: rolf tags: schema | |
2019-04-19
| ||
15:57 | Still work on validation error recovering. Closed-Leaf check-in: a00292f6a2 user: rolf tags: wip | |
2019-03-07
| ||
23:12 | Removed an ancient CONST, that somehow sliped in. check-in: afef231e60 user: rolf tags: schema | |
Changes
Changes to doc/expat.xml.
︙ | ︙ | |||
28 29 30 31 32 33 34 | to parse any kind of well-formed XML. The parsers are stream oriented XML parser. This means that you register handler scripts with the parser prior to starting the parse. These handler scripts are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register a handler script.</p> | > | | | | > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | to parse any kind of well-formed XML. The parsers are stream oriented XML parser. This means that you register handler scripts with the parser prior to starting the parse. These handler scripts are called when the parser discovers the associated structures in the document being parsed. A start tag is an example of the kind of structures for which you may register a handler script.</p> <p>The parsers always check for XML well-formedness of the input (and report error, if the input isn't well-formed). They parse the internal DTD and, at request, external DTD and external entities, if you resolve the identifier of the external entities with the -externalentitycommand script (see there). If you use the -validateCmd option (see there), the input is additionally validated.</p> <p>Additionly, the Tcl extension code that implements this command provides an API for adding C level coded handlers. Up to now, there exists the parser extension command "tdom". The handler set installed by this extension build an in memory "tDOM" DOM tree, while the parser is parsing the input.</p> <p>It is possible to register an arbitrary amount of different handler scripts |
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | until the next call to the parse method, thus delaying the reporting of some of the data.</p> <p>If this option is set to "1" then documents which are not well-formed upon end of input will generate an error.</p></desc> </optdef> <optdef> <optname>-baseurl</optname> <optarg>url</optarg> <desc><p>Reports the base url of the document to the parser.</p></desc> </optdef> | > > > > > > > > > > > | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | until the next call to the parse method, thus delaying the reporting of some of the data.</p> <p>If this option is set to "1" then documents which are not well-formed upon end of input will generate an error.</p></desc> </optdef> <optdef> <optname>-validateCmd</optname> <optarg><tdom schema cmd></optarg> <desc><p>This option expects the name of a tDOM schema command. If this option is given, then the input is also validated. If the schema command hasn't set a reportcmd then the first validation error will stop further parsing (as a well-formedness error).</p></desc> </optdef> <optdef> <optname>-baseurl</optname> <optarg>url</optarg> <desc><p>Reports the base url of the document to the parser.</p></desc> </optdef> |
︙ | ︙ |
Changes to generic/schema.c.
1 | /*---------------------------------------------------------------------------- | | | 1 2 3 4 5 6 7 8 9 | /*---------------------------------------------------------------------------- | Copyright (c) 2018, 2019 Rolf Ade ([email protected]) |----------------------------------------------------------------------------- | | | The contents of this file are subject to the Mozilla Public License | Version 2.0 (the "License"); you may not use this file except in | compliance with the License. You may obtain a copy of the License at | http://www.mozilla.org/MPL/ |
︙ | ︙ | |||
77 78 79 80 81 82 83 84 85 86 87 88 89 90 | typedef struct { SchemaData *sdata; Tcl_Interp *interp; XML_Parser parser; Tcl_DString *cdata; char *uri; int maxUriLen; } ValidateMethodData; /*---------------------------------------------------------------------------- | Macros | | > | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | typedef struct { SchemaData *sdata; Tcl_Interp *interp; XML_Parser parser; Tcl_DString *cdata; int onlyWhiteSpace; char *uri; int maxUriLen; } ValidateMethodData; /*---------------------------------------------------------------------------- | Macros | |
︙ | ︙ | |||
249 250 251 252 253 254 255 256 257 258 259 260 261 262 | #define serializeElementName(rObj, cp) \ rObj = Tcl_NewObj(); \ if (cp->namespace) { \ Tcl_SetStringObj (rObj, cp->namespace, -1); \ Tcl_AppendToObj (rObj, ":", 1); \ } \ Tcl_AppendToObj (rObj, cp->name, -1); static SchemaCP* initSchemaCP ( Schema_CP_Type type, void *namespace, char *name ) | > > | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | #define serializeElementName(rObj, cp) \ rObj = Tcl_NewObj(); \ if (cp->namespace) { \ Tcl_SetStringObj (rObj, cp->namespace, -1); \ Tcl_AppendToObj (rObj, ":", 1); \ } \ Tcl_AppendToObj (rObj, cp->name, -1); #define S(str) str, sizeof (str) -1 static SchemaCP* initSchemaCP ( Schema_CP_Type type, void *namespace, char *name ) |
︙ | ︙ | |||
503 504 505 506 507 508 509 510 511 512 513 514 515 516 | FREE (sdata->evalStub); Tcl_DecrRefCount (sdata->textStub[0]); Tcl_DecrRefCount (sdata->textStub[1]); Tcl_DecrRefCount (sdata->textStub[2]); FREE (sdata->textStub); Tcl_DStringFree (sdata->cdata); FREE (sdata->cdata); FREE (sdata); } static void cleanupLastPattern ( SchemaData *sdata, unsigned int from | > > > | 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 | FREE (sdata->evalStub); Tcl_DecrRefCount (sdata->textStub[0]); Tcl_DecrRefCount (sdata->textStub[1]); Tcl_DecrRefCount (sdata->textStub[2]); FREE (sdata->textStub); Tcl_DStringFree (sdata->cdata); FREE (sdata->cdata); if (sdata->reportCmd) { Tcl_DecrRefCount (sdata->reportCmd); } FREE (sdata); } static void cleanupLastPattern ( SchemaData *sdata, unsigned int from |
︙ | ︙ | |||
693 694 695 696 697 698 699 700 701 702 703 704 705 706 | sdata->stack->interleaveState = NULL; } se = sdata->stack->down; sdata->stack->down = sdata->stackPool; sdata->stackPool = sdata->stack; sdata->stack = se; } /* The cp argument must be type SCHEMA_CTYPE_TEXT */ static int checkText ( Tcl_Interp *interp, void *clientData, char *text | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 | sdata->stack->interleaveState = NULL; } se = sdata->stack->down; sdata->stack->down = sdata->stackPool; sdata->stackPool = sdata->stack; sdata->stack = se; } static int recover ( Tcl_Interp *interp, SchemaData *sdata, const char *errType, int len ) { Tcl_Obj *cmdPtr; int rc; if (!sdata->reportCmd) return 0; cmdPtr = Tcl_DuplicateObj (sdata->reportCmd); Tcl_IncrRefCount(cmdPtr); Tcl_ListObjAppendElement (interp, cmdPtr, sdata->self); Tcl_ListObjAppendElement ( interp, cmdPtr, Tcl_NewStringObj (errType, len) ); sdata->currentEvals++; rc = Tcl_EvalObjEx (interp, cmdPtr, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT); sdata->currentEvals--; Tcl_DecrRefCount (cmdPtr); if (rc != TCL_OK) { sdata->evalError = 1; return 0; } return 1; } /* The cp argument must be type SCHEMA_CTYPE_TEXT */ static int checkText ( Tcl_Interp *interp, void *clientData, char *text |
︙ | ︙ | |||
747 748 749 750 751 752 753 | char *namespace ) { SchemaCP *cp, *candidate, *icp; int hm, ac, i, mayskip, rc; int isName = 0; SchemaValidationStack *se; | < < < < < < < | < < | < < < < < < < | < | 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 | char *namespace ) { SchemaCP *cp, *candidate, *icp; int hm, ac, i, mayskip, rc; int isName = 0; SchemaValidationStack *se; if (!sdata->stack) return 0; se = sdata->stack; getContext (cp, ac, hm); switch (cp->type) { case SCHEMA_CTYPE_NAME: isName = 1; /* fall through */ case SCHEMA_CTYPE_PATTERN: 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; case SCHEMA_CTYPE_ANY: updateStack (se, cp, ac); |
︙ | ︙ | |||
844 845 846 847 848 849 850 | return 1; } popStack (sdata); if (rc == -1) mayskip = 1; break; case SCHEMA_CTYPE_VIRTUAL: | | < > > > > > > > > > > > | > > > > > > > > < > > > > > > > | 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 | return 1; } popStack (sdata); if (rc == -1) mayskip = 1; break; case SCHEMA_CTYPE_VIRTUAL: Tcl_Panic ("Virtual constrain in MIXED or CHOICE"); } if (!mayskip && mayMiss (candidate->quants[i])) mayskip = 1; } break; case SCHEMA_CTYPE_VIRTUAL: if (evalVirtual (interp, sdata, candidate)) { /* Virtual contraints are always quant ONE, so * that the virtual constraints are called while * looking if an element can end. Therefor we use * here the already present mayskip mechanism to * try further, after calling the tcl script. */ mayskip = 1; break; } else return 0; case SCHEMA_CTYPE_INTERLEAVE: case SCHEMA_CTYPE_PATTERN: pushToStack (sdata, candidate); rc = matchElementStart (interp, sdata, name, namespace); if (rc == 1) { updateStack (se, cp, ac); return 1; } popStack (sdata); break; } 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; } return -1; case SCHEMA_CTYPE_VIRTUAL: case SCHEMA_CTYPE_CHOICE: case SCHEMA_CTYPE_TEXT: case SCHEMA_CTYPE_ANY: /* Never pushed onto stack */ Tcl_Panic ("Invalid CTYPE onto the validation stack!"); case SCHEMA_CTYPE_INTERLEAVE: mayskip = 1; for (i = 0; i < cp->nc; i++) { if (se->interleaveState[i]) { if (maxOne (cp->quants[i])) continue; } icp = cp->content[i]; switch (icp->type) { case SCHEMA_CTYPE_TEXT: if (icp->nc) { if (!checkText (interp, icp, "")) { mayskip = 0; } } break; case SCHEMA_CTYPE_ANY: sdata->skipDeep = 1; if (mayskip && minOne (cp->quants[i])) mayskip = 0; se->hasMatched = 1; se->interleaveState[i] = 1; return 1; case SCHEMA_CTYPE_NAME: if (icp->name == name && icp->namespace == namespace) { |
︙ | ︙ | |||
928 929 930 931 932 933 934 | rc = matchElementStart (interp, sdata, name, namespace); if (rc == 1) { se->hasMatched = 1; se->interleaveState[i] = 1; return 1; } popStack (sdata); | | > | > > > | | > | | 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 | rc = matchElementStart (interp, sdata, name, namespace); if (rc == 1) { se->hasMatched = 1; se->interleaveState[i] = 1; return 1; } popStack (sdata); if (mayskip && rc != -1) mayskip = 0; break; case SCHEMA_CTYPE_VIRTUAL: Tcl_Panic ("Virtual constraint child of INTERLEAVE"); break; } } if (mayskip) break; if (recover (interp, sdata, S("UNCOMPLET_CP"))) { sdata->skipDeep = 2; return 1; } } return -1; } int probeElement ( Tcl_Interp *interp, SchemaData *sdata, const char *name, |
︙ | ︙ | |||
1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 | } if (sdata->stack) { SchemaValidationStack *se; se = sdata->stack; if (se->pattern->type == SCHEMA_CTYPE_NAME && se->activeChild >= se->pattern->nc) { SetResult ("Unexpected child element \""); if (namespacePtr) { Tcl_AppendResult (interp, namespacePtr, ":", NULL); } Tcl_AppendResult (interp, name, "\" for element \"", NULL); if (se->pattern->namespace) { Tcl_AppendResult (interp, namespace, ":", NULL); } Tcl_AppendResult (interp, name, "\"", NULL); return TCL_ERROR; } } else { if (!pattern) { SetResult ("Unknown element"); return TCL_ERROR; } pushToStack (sdata, pattern); sdata->validationState = VALIDATION_STARTED; return TCL_OK; } | > > > > > > > > | 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 | } 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, name, "\" for element \"", NULL); if (se->pattern->namespace) { 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); sdata->validationState = VALIDATION_STARTED; return TCL_OK; } |
︙ | ︙ | |||
1116 1117 1118 1119 1120 1121 1122 | if (!cp->attrs[i]->namespace || (strcmp (cp->attrs[i]->namespace, namespace) != 0)) continue; } if (strcmp (ln, cp->attrs[i]->name) == 0) { found = 1; if (cp->attrs[i]->cp) { | | > > | | | | | > > | | > | 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 | if (!cp->attrs[i]->namespace || (strcmp (cp->attrs[i]->namespace, namespace) != 0)) continue; } if (strcmp (ln, cp->attrs[i]->name) == 0) { found = 1; if (cp->attrs[i]->cp) { if (!checkText (interp, cp->attrs[i]->cp, (char *) atPtr[1])) { if (!recover (interp, sdata, S("WRONG_ATTRIBUTE_VALUE"))) { if (nsatt) namespace[j] = '\xFF'; SetResult3 ("Attribute value doesn't match for " "attribute '", atPtr[0], "'"); return TCL_ERROR; } } } if (cp->attrs[i]->required) reqAttr++; break; } } if (nsatt) namespace[j] = '\xFF'; if (!found) { if (!recover (interp, sdata, S("UNKNOWN_ATTRIBUTE"))) { SetResult3 ("Unknown attribute \"", atPtr[0], "\""); return TCL_ERROR; } } } if (reqAttr != cp->numReqAttr) { /* Lookup the missing attribute(s) */ SetResult ("Missing mandatory attribute(s):"); for (i = 0; i < cp->numAttr; i++) { if (!cp->attrs[i]->required) continue; |
︙ | ︙ | |||
1165 1166 1167 1168 1169 1170 1171 | } if (strcmp (atPtr[0], cp->attrs[i]->name) == 0) { found = 1; break; } } if (!found) { | > | | | | | > > | > | 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 | } if (strcmp (atPtr[0], cp->attrs[i]->name) == 0) { found = 1; break; } } if (!found) { if (!recover (interp, sdata, S("MISSING_ATTRIBUTE"))) { if (cp->attrs[i]->namespace) { Tcl_AppendResult (interp, " ", cp->attrs[i]->namespace, ":", cp->attrs[i]->name, NULL); } else { Tcl_AppendResult (interp, " ", cp->attrs[i]->name, NULL); } } } } if (!sdata->reportCmd) { return TCL_ERROR; } } return TCL_OK; } int probeDomAttributes ( Tcl_Interp *interp, SchemaData *sdata, |
︙ | ︙ | |||
1218 1219 1220 1221 1222 1223 1224 | if (!cp->attrs[i]->namespace) continue; if (strcmp (ns, cp->attrs[i]->namespace) != 0) continue; } else { if (cp->attrs[i]->namespace) continue; } if (strcmp (ln, cp->attrs[i]->name) == 0) { if (cp->attrs[i]->cp) { | | > > | | | | > > | | | | | | | | | > | 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 | if (!cp->attrs[i]->namespace) continue; if (strcmp (ns, cp->attrs[i]->namespace) != 0) continue; } else { if (cp->attrs[i]->namespace) continue; } if (strcmp (ln, cp->attrs[i]->name) == 0) { if (cp->attrs[i]->cp) { if (!checkText (interp, cp->attrs[i]->cp, (char *) atPtr->nodeValue)) { if (!recover (interp, sdata, S("WRONG_ATTRIBUTE_VALUE"))) { SetResult3 ("Attribute value doesn't match for " "attribute '", ln, "'"); return TCL_ERROR; } } } found = 1; if (cp->attrs[i]->required) reqAttr++; break; } } if (!found) { if (!recover (interp, sdata, S("UNKNOWN_ATTRIBUTE"))) { if (ns) { SetResult ("Unknown attribute \""); Tcl_AppendResult (interp, ns, ":", atPtr->nodeName, "\""); } else { SetResult3 ("Unknown attribute \"", atPtr->nodeName, "\""); } sdata->validationState = VALIDATION_ERROR; return TCL_ERROR; } } nextAttr: atPtr = atPtr->nextSibling; } if (reqAttr != cp->numReqAttr) { /* Lookup the missing attribute(s) */ SetResult ("Missing mandatory attribute(s):"); |
︙ | ︙ | |||
1278 1279 1280 1281 1282 1283 1284 | found = 1; break; } nextAttr2: atPtr = atPtr->nextSibling; } if (!found) { | > | | | | | > > > | | > | | 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 | found = 1; break; } nextAttr2: atPtr = atPtr->nextSibling; } if (!found) { if (!recover (interp, sdata, S("MISSING_ATTRIBUTE"))) { if (cp->attrs[i]->namespace) { Tcl_AppendResult (interp, " ", cp->attrs[i]->namespace, ":", cp->attrs[i]->name, NULL); } else { Tcl_AppendResult (interp, " ", cp->attrs[i]->name, NULL); } } } } if (!sdata->reportCmd) { sdata->validationState = VALIDATION_ERROR; return TCL_ERROR; } } return TCL_OK; } static int checkElementEnd ( Tcl_Interp *interp, SchemaData *sdata ) { SchemaValidationStack *se; SchemaCP *cp, *ic; int hm, ac, i, mayMiss, rc; int isName = 0; DBG(fprintf (stderr, "checkElementEnd:\n"); serializeStack(sdata);); se = sdata->stack; |
︙ | ︙ | |||
1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 | ac++; continue; } switch (cp->content[ac]->type) { case SCHEMA_CTYPE_TEXT: if (cp->content[ac]->nc) { if (!checkText (interp, cp->content[ac], "")) { return 0; } } break; case SCHEMA_CTYPE_CHOICE: mayMiss = 0; | > > > | 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 | ac++; continue; } switch (cp->content[ac]->type) { case SCHEMA_CTYPE_TEXT: if (cp->content[ac]->nc) { if (!checkText (interp, cp->content[ac], "")) { if (recover (interp, sdata, S("MISSING_TEXT"))) { break; } return 0; } } break; case SCHEMA_CTYPE_CHOICE: mayMiss = 0; |
︙ | ︙ | |||
1366 1367 1368 1369 1370 1371 1372 | if (checkElementEnd (interp, sdata)) { mayMiss = 1; } popStack (sdata); break; case SCHEMA_CTYPE_VIRTUAL: | | < < | < < > | | < | < < | > > > > > > > | 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 | if (checkElementEnd (interp, sdata)) { mayMiss = 1; } popStack (sdata); break; case SCHEMA_CTYPE_VIRTUAL: Tcl_Panic ("Virtual constrain in MIXED or CHOICE"); } if (mayMiss) break; } if (mayMiss) break; if (!recover (interp, sdata, S("MISSING_ONE_OF_CHOICE"))) { return 0; } break; case SCHEMA_CTYPE_VIRTUAL: if (evalVirtual (interp, sdata, cp->content[ac])) break; else return 0; case SCHEMA_CTYPE_INTERLEAVE: case SCHEMA_CTYPE_PATTERN: pushToStack (sdata, cp->content[ac]); rc = checkElementEnd (interp, sdata); popStack (sdata); if (rc) break; return 0; case SCHEMA_CTYPE_ANY: case SCHEMA_CTYPE_NAME: if (recover (interp, sdata, S("MISSING_ELEMENT"))) { break; } return 0; } ac++; } if (isName) return 1; return -1; case SCHEMA_CTYPE_VIRTUAL: case SCHEMA_CTYPE_CHOICE: case SCHEMA_CTYPE_TEXT: case SCHEMA_CTYPE_ANY: /* Never pushed onto stack */ Tcl_Panic ("Invalid CTYPE onto the validation stack!"); return 0; case SCHEMA_CTYPE_INTERLEAVE: for (i = 0; i < cp->nc; i++) { if (mustMatch (cp->quants[i], se->interleaveState[i])) { if (recover (interp, sdata, S("MISSING_ONE_OF_INTERLEAVE"))) { break; } return 0; } } return -1; } return 0; } |
︙ | ︙ | |||
1488 1489 1490 1491 1492 1493 1494 | matchText ( Tcl_Interp *interp, SchemaData *sdata, char *text ) { SchemaCP *cp, *candidate, *ic; | | | 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 | matchText ( Tcl_Interp *interp, SchemaData *sdata, char *text ) { SchemaCP *cp, *candidate, *ic; SchemaValidationStack *se; int ac, hm, isName = 0, i; DBG(fprintf (stderr, "matchText called with text '%s'\n", text)); while (1) { se = sdata->stack; getContext (cp, ac, hm); |
︙ | ︙ | |||
1542 1543 1544 1545 1546 1547 1548 | updateStack (se, cp, ac); return 1; } popStack (sdata); break; case SCHEMA_CTYPE_VIRTUAL: | < < < < | 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 | updateStack (se, cp, ac); return 1; } popStack (sdata); break; case SCHEMA_CTYPE_VIRTUAL: if (!evalVirtual (interp, sdata, ic)) return 0; break; case SCHEMA_CTYPE_CHOICE: Tcl_Panic ("MIXED or CHOICE child of MIXED or CHOICE"); } |
︙ | ︙ | |||
1575 1576 1577 1578 1579 1580 1581 | if (mustMatch (cp->quants[ac], hm)) { SetResult ("Unexpected text content"); return 0; } break; case SCHEMA_CTYPE_VIRTUAL: | < < < < | 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 | if (mustMatch (cp->quants[ac], hm)) { SetResult ("Unexpected text content"); return 0; } break; case SCHEMA_CTYPE_VIRTUAL: if (!evalVirtual (interp, sdata, ic)) return 0; break; case SCHEMA_CTYPE_NAME: case SCHEMA_CTYPE_ANY: if (mustMatch (cp->quants[ac], hm)) { SetResult ("Unexpected text content"); |
︙ | ︙ | |||
1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 | break; } if (only_whites) return TCL_OK; if (matchText (interp, sdata, text)) { return TCL_OK; } } SetResult ("Text content doesn't match"); return TCL_ERROR; } static void startElement( void *userData, const char *name, const char **atts ) { ValidateMethodData *vdata = (ValidateMethodData *) userData; char *namespace; const char *s; int i = 0; DBG(fprintf (stderr, "startElement: '%s'\n", name);) | > > > > < | | | | > > | 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 | break; } if (only_whites) return TCL_OK; if (matchText (interp, sdata, text)) { return TCL_OK; } } if (recover (interp, sdata, S("WRONG_VALUE"))) { return TCL_OK; } SetResult ("Text content doesn't match"); return TCL_ERROR; } static void startElement( void *userData, const char *name, const char **atts ) { ValidateMethodData *vdata = (ValidateMethodData *) userData; SchemaData *sdata; char *namespace; const char *s; int i = 0; DBG(fprintf (stderr, "startElement: '%s'\n", name);) sdata = vdata->sdata; if (!sdata->skipDeep && sdata->stack && Tcl_DStringLength (vdata->cdata)) { if (probeText (vdata->interp, sdata, Tcl_DStringValue (vdata->cdata)) != TCL_OK) { sdata->validationState = VALIDATION_ERROR; XML_StopParser (vdata->parser, 0); Tcl_DStringSetLength (vdata->cdata, 0); vdata->onlyWhiteSpace = 1; return; } Tcl_DStringSetLength (vdata->cdata, 0); vdata->onlyWhiteSpace = 1; } s = name; while (*s && *s != '\xFF') { i++; s++; } namespace = NULL; if (*s == '\xFF') { |
︙ | ︙ | |||
1743 1744 1745 1746 1747 1748 1749 | vdata->uri[i] = '\0'; namespace = vdata->uri; } } else { s = name; } | | | > | | | > | > | | < | | > > > > | | > | > > > > > > > > > > > > > > > > | 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 | vdata->uri[i] = '\0'; namespace = vdata->uri; } } else { s = name; } if (probeElement (vdata->interp, sdata, s, namespace) != TCL_OK) { sdata->validationState = VALIDATION_ERROR; XML_StopParser (vdata->parser, 0); return; } if (atts[0] || (sdata->stack && sdata->stack->pattern->attrs)) { if (probeAttributes (vdata->interp, sdata, atts) != TCL_OK) { sdata->validationState = VALIDATION_ERROR; XML_StopParser (vdata->parser, 0); } } } static void endElement ( void *userData, const char *name ) { ValidateMethodData *vdata = (ValidateMethodData *) userData; SchemaData *sdata; DBG(fprintf (stderr, "endElement: '%s'\n", name);) sdata = vdata->sdata; if (sdata->validationState == VALIDATION_ERROR) { return; } if (!sdata->skipDeep && sdata->stack && Tcl_DStringLength (vdata->cdata)) { if (probeText (vdata->interp, sdata, Tcl_DStringValue (vdata->cdata)) != TCL_OK) { sdata->validationState = VALIDATION_ERROR; XML_StopParser (vdata->parser, 0); Tcl_DStringSetLength (vdata->cdata, 0); vdata->onlyWhiteSpace = 1; return; } } if (Tcl_DStringLength (vdata->cdata)) { Tcl_DStringSetLength (vdata->cdata, 0); vdata->onlyWhiteSpace = 1; } if (probeElementEnd (vdata->interp, sdata) != TCL_OK) { sdata->validationState = VALIDATION_ERROR; XML_StopParser (vdata->parser, 0); } } static void characterDataHandler ( void *userData, const char *s, int len ) { ValidateMethodData *vdata = (ValidateMethodData *) userData; const char *pc; if (vdata->onlyWhiteSpace) { int i = 0; pc = s; while (i < len) { if ( (*pc == ' ') || (*pc == '\n') || (*pc == '\r') || (*pc == '\t') ) { pc++; i++; continue; } vdata->onlyWhiteSpace = 0; break; } } Tcl_DStringAppend (vdata->cdata, s, len); } static int validateString ( Tcl_Interp *interp, SchemaData *sdata, |
︙ | ︙ | |||
1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 | parser = XML_ParserCreate_MM (NULL, MEM_SUITE, &sep); vdata.interp = interp; vdata.sdata = sdata; vdata.parser = parser; Tcl_DStringInit (&cdata); vdata.cdata = &cdata; vdata.uri = (char *) MALLOC (URI_BUFFER_LEN_INIT); vdata.maxUriLen = URI_BUFFER_LEN_INIT; XML_SetUserData (parser, &vdata); XML_SetElementHandler (parser, startElement, endElement); XML_SetCharacterDataHandler (parser, characterDataHandler); if (XML_Parse (parser, xmlstr, len, 1) != XML_STATUS_OK | > | 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 | parser = XML_ParserCreate_MM (NULL, MEM_SUITE, &sep); vdata.interp = interp; vdata.sdata = sdata; vdata.parser = parser; Tcl_DStringInit (&cdata); vdata.cdata = &cdata; vdata.onlyWhiteSpace = 1; vdata.uri = (char *) MALLOC (URI_BUFFER_LEN_INIT); vdata.maxUriLen = URI_BUFFER_LEN_INIT; XML_SetUserData (parser, &vdata); XML_SetElementHandler (parser, startElement, endElement); XML_SetCharacterDataHandler (parser, characterDataHandler); if (XML_Parse (parser, xmlstr, len, 1) != XML_STATUS_OK |
︙ | ︙ | |||
3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 | pattern->type = SCHEMA_CTYPE_TEXT; } else { h = Tcl_FindHashEntry (&sdata->textDef, Tcl_GetString (objv[2])); if (!h) { SetResult3 ("Unknown text type \"", Tcl_GetString (objv[2]), "\""); return TCL_ERROR; } pattern = (SchemaCP *) Tcl_GetHashValue (h); sdata->cp->flags |= CONSTRAINT_TEXT_CHILD; } if (objc < 3) { REMEMBER_PATTERN (pattern) } addToContent (sdata, pattern, quant, 0, 0); | > | 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 | pattern->type = SCHEMA_CTYPE_TEXT; } else { h = Tcl_FindHashEntry (&sdata->textDef, Tcl_GetString (objv[2])); if (!h) { SetResult3 ("Unknown text type \"", Tcl_GetString (objv[2]), "\""); return TCL_ERROR; } quant = SCHEMA_CQUANT_ONE; pattern = (SchemaCP *) Tcl_GetHashValue (h); sdata->cp->flags |= CONSTRAINT_TEXT_CHILD; } if (objc < 3) { REMEMBER_PATTERN (pattern) } addToContent (sdata, pattern, quant, 0, 0); |
︙ | ︙ |
Changes to tests/schema.test.
︙ | ︙ | |||
1920 1921 1922 1923 1924 1925 1926 | element a any element b } defelement a {} defelement b {} } | > > | | > > > | 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 | element a any element b } defelement a {} defelement b {} } set result [list] foreach xml { <doc><a/><something/><b/></doc> <doc><a/><a><b>text</b><c><c><c/></c></c></a><b/></doc> } { lappend result [s validate $xml] } s delete set result } {1 1} test schema-10.2 {any} { tdom::schema create s s define { |
︙ | ︙ | |||
3762 3763 3764 3765 3766 3767 3768 3769 3770 | element a2 } } set result [lsort [s info defelements]] s delete set result } {a b} } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 | element a2 } } set result [lsort [s info defelements]] s delete set result } {a b} proc schema-18 {args} { lappend ::result {*}$args } test schema-18.1 {reportcmd} { tdom::schema s s define { defelement doc { element e text {minLength 1} element e } } s reportcmd schema-18 set result "" set rc [s validate {<doc><e/></doc>}] lappend result $rc s delete set result } {s MISSING_TEXT s MISSING_ELEMENT 1} test schema-18.1a {reportcmd} { tdom::schema s s define { defelement doc { element e text {minLength 1} element e } } s reportcmd schema-18 set result "" set rc [s validate {<doc><e/><e/></doc>}] lappend result $rc s delete set result } {s MISSING_TEXT 1} test schema-18.2 {reportcmd} { tdom::schema s s define { defelement doc { element a element b element c } } s reportcmd schema-18 set result "" set rc [s validate {<doc><a/><c/></doc>}] lappend result $rc s delete set result } {s MISSING_CP 1} test schema-18.3 {reportcmd} { tdom::schema s s define { defelement doc { element a } } s reportcmd schema-18 set result "" foreach xml { <foo/> <bar>baz</bar> <bar>baz<a/>grill</bar> <bar><a><b/></a></bar> } { set rc [s validate $xml] lappend result $rc } s delete set result } {s UNKNOWN_ROOT_ELEMENT 1 s UNKNOWN_ROOT_ELEMENT 1 s UNKNOWN_ROOT_ELEMENT 1 s UNKNOWN_ROOT_ELEMENT 1} proc validatedSAX {g xml {keepEmpties 1}} { set args [list -validateCmd $g] if {!$keepEmpties} { lappend args -ignorewhitespace 1 } xml::parser p {*}$args set rc [catch {p parse $xml} errMsg] p delete return $rc } proc validatedDOM {g xml {keepEmpties 0}} { set args [list -validateCmd $g] if {$keepEmpties} { lappend args -keepEmpties } set rc [catch { set doc [dom parse {*}$args $xml] } errMsg] if {$doc ne ""} { $doc delete } return $rc } proc postValidation {g xml} { set doc [dom parse $xml] set rc [$g domvalidate $doc errMsg] $doc delete return $rc } } |