Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Work on validation error recovery continues. Since there seems to be no silver bullet, this throws code sprinkled all over the code to make some progress. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | wip |
Files: | files | file ages | folders |
SHA3-256: |
70f5d362f727026b15599f4f81a90318 |
User & Date: | rolf 2019-10-31 14:12:42 |
Context
2019-11-01
| ||
15:42 | Added more fine print towards being able to calculate the set of possible (expected) events in case of validation error. check-in: 6a02d5bab5 user: rolf tags: wip | |
2019-10-31
| ||
14:12 | Work on validation error recovery continues. Since there seems to be no silver bullet, this throws code sprinkled all over the code to make some progress. check-in: 70f5d362f7 user: rolf tags: wip | |
2019-10-28
| ||
00:33 | Added a test. check-in: fd510a13be user: rolf tags: wip | |
Changes
Changes to generic/schema.c.
74 75 76 77 78 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 ... 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 ... 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 ... 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 960 961 962 963 964 965 966 967 968 969 970 971 972 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 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 .... 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 .... 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 .... 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 .... 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 .... 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 .... 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 .... 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 .... 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 .... 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 .... 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 .... 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 .... 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 .... 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 .... 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 .... 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 .... 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 .... 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 .... 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 .... 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 .... 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 .... 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 .... 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 .... 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 .... 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 .... 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 .... 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 .... 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 .... 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 .... 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 .... 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 .... 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 .... 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 .... 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 .... 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 .... 4677 4678 4679 4680 4681 4682 4683 4684 4685 4686 4687 4688 4689 4690 |
XML_Parser parser; Tcl_DString *cdata; int onlyWhiteSpace; char *uri; int maxUriLen; } ValidateMethodData; typedef enum { DOM_KEYCONSTRAINT, MISSING_ANY, MISSING_ATTRIBUTE, MISSING_CP, MISSING_ELEMENT, MISSING_ONE_OF_CHOICE, MISSING_ONE_OF_INTERLEAVE, MISSING_TEXT, UNEXPECTED_DOCUMENT_ELEMENT, UNEXPECTED_DOCUMENT_ELEMENT_NAMESPACE, UNEXPECTED_ELEMENT, UNKNOWN_ATTRIBUTE, INVALID_KEYREF, UNKNOWN_ROOT_ELEMENT, UNKOWN_GLOBAL_ID, UNKOWN_ID, INVALID_ATTRIBUTE_VALUE, INVALID_VALUE } ValidationErrorType; static char *ValidationErrorType2str[] = { "DOM_KEYCONSTRAINT", "MISSING_ANY", "MISSING_ATTRIBUTE", "MISSING_CP", "MISSING_ELEMENT", "MISSING_ONE_OF_CHOICE", "MISSING_ONE_OF_INTERLEAVE", "MISSING_TEXT", "UNEXPECTED_DOCUMENT_ELEMENT", "UNEXPECTED_DOCUMENT_ELEMENT_NAMESPACE", "UNEXPECTED_ELEMENT", "UNKNOWN_ATTRIBUTE", "INVALID_KEYREF", "UNKNOWN_ROOT_ELEMENT", "UNKOWN_GLOBAL_ID", "UNKOWN_ID", "INVALID_ATTRIBUTE_VALUE", "INVALID_VALUE" }; ................................................................................ se->activeChild = ac + 1; \ se->hasMatched = 0; \ } else { \ se->activeChild = ac; \ se->hasMatched = 1; \ } #define S(str) str, sizeof (str) -1 static SchemaCP* initSchemaCP ( Schema_CP_Type type, void *namespace, char *name ) { ................................................................................ int ac ) { SchemaValidationStack *se; DBG(fprintf(stderr, "push to Stack:\n");serializeCP(pattern)); se = getStackElement (sdata, pattern); if (sdata->stack) sdata->stack->activeChild = ac; se->down = sdata->stack; if (pattern->type == SCHEMA_CTYPE_INTERLEAVE) { se->interleaveState = MALLOC (sizeof (int) * pattern->nc); memset (se->interleaveState, 0, sizeof (int) * pattern->nc); } sdata->stack = se; } ................................................................................ /* cp is still the pattern from stack top before the popStack */ if (cp->type != SCHEMA_CTYPE_NAME) { finalizeElement (sdata, sdata->stack->activeChild + 1); } } static int recoverex ( Tcl_Interp *interp, SchemaData *sdata, ValidationErrorType errorType ) { Tcl_Obj *cmdPtr; int rc; if (!sdata->reportCmd || sdata->evalError) return 0; cmdPtr = Tcl_DuplicateObj (sdata->reportCmd); Tcl_IncrRefCount(cmdPtr); Tcl_ListObjAppendElement (interp, cmdPtr, sdata->self); Tcl_ListObjAppendElement ( interp, cmdPtr, Tcl_NewStringObj (ValidationErrorType2str[errorType], -1) ); 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; } switch (errorType) { case DOM_KEYCONSTRAINT: case MISSING_ANY: case MISSING_ATTRIBUTE: case MISSING_CP: case MISSING_ELEMENT: case MISSING_ONE_OF_CHOICE: case MISSING_ONE_OF_INTERLEAVE: case MISSING_TEXT: case UNEXPECTED_DOCUMENT_ELEMENT: case UNEXPECTED_DOCUMENT_ELEMENT_NAMESPACE: case UNEXPECTED_ELEMENT: case UNKNOWN_ATTRIBUTE: case INVALID_KEYREF: case UNKNOWN_ROOT_ELEMENT: case UNKOWN_GLOBAL_ID: case UNKOWN_ID: case INVALID_ATTRIBUTE_VALUE: case INVALID_VALUE: break; } return 0; } static int recover ( Tcl_Interp *interp, SchemaData *sdata, const char *errType, int len, int popStack, int ac ) { Tcl_Obj *cmdPtr; int rc; if (!sdata->reportCmd || sdata->evalError) 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; } if (popStack) { finalizeElement (sdata, ac+1); sdata->skipDeep = 2; } return 1; } /* The cp argument must be type SCHEMA_CTYPE_TEXT */ static int checkText ( Tcl_Interp *interp, ................................................................................ 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"), 1, ac)) { return 1; } return 0; } } break; case SCHEMA_CTYPE_ANY: ................................................................................ if (rc == -1) mayskip = 1; break; case SCHEMA_CTYPE_KEYSPACE_END: candidate->keySpace->active--; if (!candidate->keySpace->active) { if (candidate->keySpace->unknownIDrefs) { if (!recover (interp, sdata, S("INVALID_KEYREF"), 0, 0)) { 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"), 1, ac)) { /* Skip the just opened element tag and the following * content of the current. */ return 1; } return 0; } ac++; hm = 0; } if (isName) { if (recover (interp, sdata, S("UNEXPECTED_ELEMENT"), 1, ac)) { /* Skip the just opened element tag and the following * content of the current. */ return 1; } return 0; } return -1; ................................................................................ case SCHEMA_CTYPE_KEYSPACE: Tcl_Panic ("Keyspace constraint child of INTERLEAVE"); break; } } if (mayskip) break; if (recover (interp, sdata, S("MISSING_ONE_OF_INTERLEAVE"), 1, ac)) { return 1; } return 0; } return -1; } ................................................................................ } } if (sdata->validationState == VALIDATION_READY) { /* The root of the tree to check. */ if (sdata->start) { if (strcmp (name, sdata->start) != 0) { if (recover (interp, sdata, S("UNEXPECTED_DOCUMENT_ELEMENT"), 0, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element doesn't match"); return TCL_ERROR; } if (namespace) { if (!sdata->startNamespace|| strcmp (namespace, sdata->startNamespace) != 0) { if (recover (interp, sdata, S("UNEXPECTED_DOCUMENT_ELEMENT_NAMESPACE"), 0, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element namespace doesn't match"); return TCL_ERROR; } } else { if (sdata->startNamespace) { if (recover (interp, sdata, S("UNEXPECTED_DOCUMENT_ELEMENT_NAMESPACE"), 0, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element namespace doesn't match"); return TCL_ERROR; } } ................................................................................ } 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"), 1, se->activeChild)) { return TCL_OK; } SetResult ("Unexpected child element \""); if (namespacePtr) { Tcl_AppendResult (interp, namespacePtr, ":", NULL); } Tcl_AppendResult (interp, name, "\" for element \"", NULL); ................................................................................ } Tcl_AppendResult (interp, name, "\"", NULL); return TCL_ERROR; } } else { sdata->validationState = VALIDATION_STARTED; if (!pattern) { if (recover (interp, sdata, S("UNKNOWN_ROOT_ELEMENT"), 0, 0)) { sdata->skipDeep = 1; return TCL_OK; } SetResult ("Unknown element"); return TCL_ERROR; } pushToStack (sdata, pattern, 0); ................................................................................ cp = sdata->stack->pattern; *isrequiered = 0; for (i = 0; i < cp->numAttr; i++) { if (cp->attrs[i]->namespace == ns && cp->attrs[i]->name == name) { if (cp->attrs[i]->cp) { if (!checkText (interp, cp->attrs[i]->cp, value)) { if (!recover (interp, sdata, S("INVALID_ATTRIBUTE_VALUE"), 0, 0)) { SetResult3V ("Attribute value doesn't match for " "attribute '", name , "'"); return 0; } } } if (cp->attrs[i]->required) *isrequiered = 1; ................................................................................ } else { ns = NULL; } found = probeAttribute (interp, sdata, ln, ns, atPtr[1], &req); reqAttr += req; unknowncleanup: if (!found) { if (!recover (interp, sdata, S("UNKNOWN_ATTRIBUTE"), 0, 0)) { SetResult3V ("Unknown attribute \"", atPtr[0], "\""); return TCL_ERROR; } } if (nsatt) namespace[j] = '\xFF'; } if (reqAttr != cp->numReqAttr) { ................................................................................ } if (strcmp (atPtr[0], cp->attrs[i]->name) == 0) { found = 1; break; } } if (!found) { if (!recover (interp, sdata, S("MISSING_ATTRIBUTE"), 0, 0)) { 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); } } ................................................................................ } else { ns = NULL; } found = probeAttribute (interp, sdata, ln, ns, atPtr->nodeValue, &req); reqAttr += req; unknown: if (!found) { if (!recover (interp, sdata, S("UNKNOWN_ATTRIBUTE"), 0, 0)) { if (!sdata->evalError) { if (ns) { SetResult ("Unknown attribute \""); Tcl_AppendResult (interp, ns, ":", atPtr->nodeName, "\""); } else { SetResult3 ("Unknown attribute \"", atPtr->nodeName, ................................................................................ found = 1; break; } nextAttr2: atPtr = atPtr->nextSibling; } if (!found) { if (!recover (interp, sdata, S("MISSING_ATTRIBUTE"), 0, 0)) { if (!sdata->evalError) { 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, ................................................................................ ns = Tcl_GetHashKey (&sdata->namespace, h); } found = probeAttribute (interp, sdata, name, ns, Tcl_GetString (attvalue), &req); reqAttr += req; unknown: if (!found) { if (!recover (interp, sdata, S("UNKNOWN_ATTRIBUTE"), 0, 0)) { if (ns) { SetResult ("Unknown attribute \""); Tcl_AppendResult (interp, ns, ":", name, "\""); } else { SetResult3 ("Unknown attribute \"", name, "\""); } ................................................................................ } switch (cp->content[ac]->type) { case SCHEMA_CTYPE_KEYSPACE_END: cp->content[ac]->keySpace->active--; if (!cp->content[ac]->keySpace->active) { if (cp->content[ac]->keySpace->unknownIDrefs) { if (!recover (interp, sdata, S("INVALID_KEYREF"), 0, 0)) { return 0; } cp->content[ac]->keySpace->unknownIDrefs = 0; } Tcl_DeleteHashTable (&cp->content[ac]->keySpace->ids); } break; ................................................................................ cp->content[ac]->keySpace->active++; } break; case SCHEMA_CTYPE_TEXT: if (cp->content[ac]->nc) { if (!checkText (interp, cp->content[ac], "")) { if (recover (interp, sdata, S("MISSING_TEXT"), 0, 0)) { break; } return 0; } } break; ................................................................................ case SCHEMA_CTYPE_CHOICE: Tcl_Panic ("Invalid CTYPE in MIXED or CHOICE"); } if (mayMiss) break; } if (mayMiss) break; if (!recover (interp, sdata, S("MISSING_ONE_OF_CHOICE"), 0, 0)) { return 0; } break; case SCHEMA_CTYPE_VIRTUAL: if (evalVirtual (interp, sdata, ac)) break; else return 0; ................................................................................ pushToStack (sdata, cp->content[ac], ac); rc = checkElementEnd (interp, sdata); popStack (sdata); if (rc) break; return 0; case SCHEMA_CTYPE_ANY: if (recover (interp, sdata, S("MISSING_ANY"), 0, 0)) { break; } return 0; case SCHEMA_CTYPE_NAME: if (recover (interp, sdata, S("MISSING_ELEMENT"), 0, 0)) { break; } return 0; } ac++; } if (isName) return 1; ................................................................................ /* 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"), 0, 0)) { break; } return 0; } } return -1; } ................................................................................ Tcl_HashEntry *h, *h1; Tcl_HashSearch search, search1; int haveErrMsg = 0; SchemaDocKey *dk; if (sdata->evalError) return 0; if (sdata->unknownIDrefs) { if (!recover (interp, sdata, S("UNKOWN_ID"), 0, 0)) { haveErrMsg = 1; SetResult ("References to unknown IDs:"); for (h = Tcl_FirstHashEntry (&sdata->ids, &search); h != NULL; h = Tcl_NextHashEntry (&search)) { if (Tcl_GetHashValue (h) == 0) { Tcl_AppendResult (interp, " '", ................................................................................ } if (sdata->idTables.numEntries) { for (h = Tcl_FirstHashEntry (&sdata->idTables, &search); h != NULL; h = Tcl_NextHashEntry (&search)) { dk = Tcl_GetHashValue (h); if (dk->unknownIDrefs) { if (!recover (interp, sdata, S("UNKOWN_GLOBAL_ID"), 0, 0)) { if (haveErrMsg) { Tcl_AppendResult (interp, "\n", NULL); } else { haveErrMsg = 1; } Tcl_AppendResult (interp, "References to unknown IDs in ID space '", ................................................................................ switch (candidate->type) { case SCHEMA_CTYPE_TEXT: if (checkText (interp, candidate, text)) { updateStack (se, cp, ac); return 1; } if (sdata->evalError) return 0; if (recover (interp, sdata, S("INVALID_VALUE"), 0, 0)) { updateStack (se, cp, ac); return 1; } else { return 0; } SetResult ("Invalid text content"); return 0; ................................................................................ case SCHEMA_CTYPE_KEYSPACE: Tcl_Panic ("Keyspace constrain in MIXED or" " CHOICE"); } } if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, S("MISSING_ONE_OF_CHOICE"), 0, 0)) { break; } SetResultV ("Unexpected text content"); return 0; } break; ................................................................................ pushToStack (sdata, candidate, ac); if (matchText (interp, sdata, text)) { updateStack (se, cp, ac); return 1; } popStack (sdata); if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, S("MISSING_CP"), 0, 0)) { break; } SetResultV ("Unexpected text content"); return 0; } break; ................................................................................ } break; case SCHEMA_CTYPE_KEYSPACE_END: cp->content[ac]->keySpace->active--; if (!cp->content[ac]->keySpace->active) { if (cp->content[ac]->keySpace->unknownIDrefs) { if (!recover (interp, sdata, S("INVALID_KEYREF"), 0, 0)) { return 0; } cp->content[ac]->keySpace->unknownIDrefs = 0; } Tcl_DeleteHashTable (&cp->content[ac]->keySpace->ids); } break; case SCHEMA_CTYPE_NAME: case SCHEMA_CTYPE_ANY: if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, S("MISSING_ELEMENT"), 0, 0)) { break; } SetResultV ("Unexpected text content"); return 0; } break; } ac++; } if (isName) { if (recover (interp, sdata, S("MISSING_ELEMENT"), 0, 0)) { return 1; } SetResultV ("Unexpected text content"); return 0; } popStack (sdata); continue; ................................................................................ } if (frs.type == EmptyResult || frs.nr_nodes == 0) { if (kc->flags & DKC_FLAG_IGNORE_EMPTY_FIELD_SET) { continue; } Tcl_CreateHashEntry (&htable, "", &hnew); if (!hnew) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } continue; } if (frs.nr_nodes != 1) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType != ELEMENT_NODE && frs.nodes[0]->nodeType != ATTRIBUTE_NODE) { ................................................................................ SetResult ("INVALID_DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType == ATTRIBUTE_NODE) { attr = (domAttrNode *) frs.nodes[0]; Tcl_CreateHashEntry (&htable, attr->nodeValue, &hnew); if (!hnew) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } else { keystr = xpathGetStringValue (frs.nodes[0], &len); Tcl_CreateHashEntry (&htable, keystr, &hnew); FREE(keystr); if (!hnew) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } } else { ................................................................................ continue; } if (first) first = 0; else Tcl_DStringAppend (&dStr, ":", 1); continue; } if (frs.nr_nodes != 1) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { skip = 1; break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType != ELEMENT_NODE ................................................................................ keystr = xpathGetStringValue (frs.nodes[0], &len); Tcl_DStringAppend (&dStr, keystr, len); } } if (skip) break; Tcl_CreateHashEntry (&htable, Tcl_DStringValue (&dStr), &hnew); if (!hnew) { if (recover (interp, sdata, S("DOM_KEYCONSTRAINT"), 0, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } } ................................................................................ SchemaKeySpace *ks; while (sdata->stack) popStack (sdata); while (sdata->lastMatchse) popFromStack (sdata, &sdata->lastMatchse); sdata->validationState = VALIDATION_READY; sdata->skipDeep = 0; sdata->evalError = 0; Tcl_DStringSetLength (sdata->cdata, 0); if (sdata->ids.numEntries) { Tcl_DeleteHashTable (&sdata->ids); Tcl_InitHashTable (&sdata->ids, TCL_STRING_KEYS); sdata->unknownIDrefs = 0; } if (sdata->idTables.numEntries) { ................................................................................ SchemaValidationStack *se; void *ns; Tcl_Obj *rObj; Tcl_HashTable localHash; static const char *schemaInstanceInfoMethods[] = { "validationstate", "vstate", "definedElements", "stack", "toplevel", "pastexpected", "nextexpected", "definition", NULL }; enum schemaInstanceInfoMethod { m_validationstate, m_vstate, m_definedElements, m_stack, m_toplevel, m_pastexpected, m_nextexpected, m_definition }; static const char *schemaInstanceInfoStackMethods[] = { "top", "inside", NULL }; enum schemaInstanceInfoStackMethod { m_top, m_inside }; if (objc < 2) { Tcl_WrongNumArgs (interp, 1, objv, "subcommand ?arguments?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj (interp, objv[1], schemaInstanceInfoMethods, ................................................................................ Tcl_SetObjResult (interp, rObj); return TCL_OK; break; } case m_toplevel: if (objc != 2) { Tcl_WrongNumArgs (interp, 1, objv, "no argument expected"); return TCL_ERROR; } if (!sdata->currentEvals) { SetResult ("not called while schema evaluation"); return TCL_ERROR; } if (!sdata->defineToplevel && sdata->currentEvals > 1) { ................................................................................ SetBooleanResult (0); } else { SetBooleanResult (1); } return TCL_OK; case m_nextexpected: if (sdata->validationState == VALIDATION_ERROR || sdata->validationState == VALIDATION_FINISHED) { return TCL_OK; } if (!sdata->stack) { if (sdata->start) { Tcl_AppendElement (interp, sdata->start); ................................................................................ Tcl_SetObjResult (interp, unifyMatchList (interp, &localHash, rObj)); Tcl_DecrRefCount (rObj); } return TCL_OK; case m_pastexpected: if (sdata->validationState == VALIDATION_READY || !sdata->stack) return TCL_OK; se = sdata->lastMatchse; if (!se) se = sdata->stack; rObj = Tcl_NewObj(); Tcl_InitHashTable (&localHash, TCL_ONE_WORD_KEYS); getNextExpected (sdata, se, interp, &localHash, rObj); ................................................................................ if (cp->namespace) { Tcl_AppendElement (interp, cp->namespace); } if (cp->defScript) { Tcl_AppendElement (interp, Tcl_GetString (cp->defScript)); } break; } return TCL_OK; } int schemaInstanceCmd ( ClientData clientData, ................................................................................ } for (i = 0; i < nrKeyspaces; i++) { Tcl_ListObjIndex (interp, objv[1], i, &ksObj); h = Tcl_CreateHashEntry (&sdata->keySpaces, Tcl_GetString (ksObj), &hnew); if (hnew) { ks = TMALLOC (SchemaKeySpace); ks->active = 0; ks->unknownIDrefs = 0; Tcl_SetHashValue (h, ks); } else { ks = Tcl_GetHashValue (h); } pattern = initSchemaCP (SCHEMA_CTYPE_KEYSPACE, |
> > > > > > > > > > > > > > > > > > < > | | < < > | | < > | > < | | | | < > > < < | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | | | < | < < | > | > < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | > | | > | > | > | > | | | < | | < | | | | > | | | > | > > | | > > | > > | > > | > | > < < < < | > | > | | > | > | | | | | | > | | | > | > | > | > | > | > | > > | > | > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
74 75 76 77 78 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 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 ... 317 318 319 320 321 322 323 324 325 326 327 328 329 330 ... 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 ... 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 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 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 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 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 .... 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 .... 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 .... 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 .... 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 .... 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 .... 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 .... 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 .... 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 .... 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 .... 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 .... 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 .... 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 .... 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 .... 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 .... 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 .... 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 .... 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 .... 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 .... 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 .... 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 .... 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 .... 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 .... 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 .... 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 .... 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 .... 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 .... 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 .... 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 .... 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 .... 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 .... 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 .... 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 .... 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 .... 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 .... 4792 4793 4794 4795 4796 4797 4798 4799 4800 4801 4802 4803 4804 4805 4806 |
XML_Parser parser; Tcl_DString *cdata; int onlyWhiteSpace; char *uri; int maxUriLen; } ValidateMethodData; typedef enum { MATCH_GLOBAL, MATCH_ELEMENT_START, MATCH_ELEMENT_END, MATCH_TEXT, MATCH_ATTRIBUTE_TEXT, MATCH_DOM_KEYCONSTRAINT } ValidationAction; static char *ValidationAction2str[] = { "MATCH_GLOBAL", "MATCH_ELEMENT_START", "MATCH_ELEMENT_END", "MATCH_TEXT", "MATCH_ATTRIBUTE_TEXT", "MATCH_DOM_KEYCONSTRAINT" }; typedef enum { DOM_KEYCONSTRAINT, MISSING_ATTRIBUTE, MISSING_ELEMENT_MATCH_START, MISSING_ELEMENT_MATCH_END, MISSING_ELEMENT_MATCH_TEXT, MISSING_TEXT_MATCH_START, MISSING_TEXT_MATCH_END, UNEXPECTED_ROOT_ELEMENT, UNEXPECTED_ELEMENT, UNKNOWN_ATTRIBUTE, INVALID_KEYREF_MATCH_START, INVALID_KEYREF_MATCH_END, INVALID_KEYREF_MATCH_TEXT, UNKNOWN_ROOT_ELEMENT, UNKOWN_GLOBAL_ID, UNKOWN_ID, INVALID_ATTRIBUTE_VALUE, INVALID_VALUE } ValidationErrorType; static char *ValidationErrorType2str[] = { "DOM_KEYCONSTRAINT", "MISSING_ATTRIBUTE", "MISSING_ELEMENT", "MISSING_ELEMENT", "MISSING_ELEMENT", "MISSING_TEXT", "MISSING_TEXT", "UNEXPECTED_ROOT_ELEMENT", "UNEXPECTED_ELEMENT", "UNKNOWN_ATTRIBUTE", "INVALID_KEYREF", "INVALID_KEYREF", "INVALID_KEYREF", "UNKNOWN_ROOT_ELEMENT", "UNKOWN_GLOBAL_ID", "UNKOWN_ID", "INVALID_ATTRIBUTE_VALUE", "INVALID_VALUE" }; ................................................................................ se->activeChild = ac + 1; \ se->hasMatched = 0; \ } else { \ se->activeChild = ac; \ se->hasMatched = 1; \ } static SchemaCP* initSchemaCP ( Schema_CP_Type type, void *namespace, char *name ) { ................................................................................ int ac ) { SchemaValidationStack *se; DBG(fprintf(stderr, "push to Stack:\n");serializeCP(pattern)); se = getStackElement (sdata, pattern); /* if (sdata->stack) sdata->stack->activeChild = ac; */ se->down = sdata->stack; if (pattern->type == SCHEMA_CTYPE_INTERLEAVE) { se->interleaveState = MALLOC (sizeof (int) * pattern->nc); memset (se->interleaveState, 0, sizeof (int) * pattern->nc); } sdata->stack = se; } ................................................................................ /* cp is still the pattern from stack top before the popStack */ if (cp->type != SCHEMA_CTYPE_NAME) { finalizeElement (sdata, sdata->stack->activeChild + 1); } } static int recover ( Tcl_Interp *interp, SchemaData *sdata, ValidationErrorType errorType, const char *name, const char *ns, char *text, int ac ) { Tcl_Obj *cmdPtr; int rc; SchemaValidationStack *se; if (!sdata->reportCmd || sdata->evalError) return 0; cmdPtr = Tcl_DuplicateObj (sdata->reportCmd); Tcl_IncrRefCount(cmdPtr); Tcl_ListObjAppendElement (interp, cmdPtr, sdata->self); Tcl_ListObjAppendElement ( interp, cmdPtr, Tcl_NewStringObj (ValidationErrorType2str[errorType], -1) ); sdata->vname = name; sdata->vns = ns; sdata->vtext = text; switch (errorType) { case DOM_KEYCONSTRAINT: sdata->vaction = MATCH_DOM_KEYCONSTRAINT; break; case MISSING_ATTRIBUTE: case UNKNOWN_ATTRIBUTE: case MISSING_ELEMENT_MATCH_START: case MISSING_TEXT_MATCH_START: case INVALID_KEYREF_MATCH_START: case UNEXPECTED_ROOT_ELEMENT: case UNKNOWN_ROOT_ELEMENT: case UNEXPECTED_ELEMENT: sdata->vaction = MATCH_ELEMENT_START; break; case MISSING_TEXT_MATCH_END: case INVALID_KEYREF_MATCH_END: case MISSING_ELEMENT_MATCH_END: if (sdata->stack) { se = sdata->stack; while (se->pattern->type != SCHEMA_CTYPE_NAME) { se = se->down; } sdata->vname = se->pattern->name; sdata->vns = se->pattern->namespace; } sdata->vaction = MATCH_ELEMENT_END; break; case MISSING_ELEMENT_MATCH_TEXT: sdata->vaction = MATCH_TEXT; break; case INVALID_KEYREF_MATCH_TEXT: case INVALID_VALUE: if (sdata->stack) { se = sdata->stack; while (se->pattern->type != SCHEMA_CTYPE_NAME) { se = se->down; } sdata->vname = se->pattern->name; sdata->vns = se->pattern->namespace; } sdata->vaction = MATCH_TEXT; break; case UNKOWN_GLOBAL_ID: case UNKOWN_ID: sdata->vaction = MATCH_TEXT; break; case INVALID_ATTRIBUTE_VALUE: sdata->vaction = MATCH_ATTRIBUTE_TEXT; break; } sdata->currentEvals++; rc = Tcl_EvalObjEx (interp, cmdPtr, TCL_EVAL_GLOBAL | TCL_EVAL_DIRECT); sdata->currentEvals--; sdata->vaction = MATCH_GLOBAL; sdata->vname = NULL; sdata->vns = NULL; sdata->vtext = NULL; Tcl_DecrRefCount (cmdPtr); if (rc != TCL_OK) { sdata->evalError = 1; return 0; } switch (errorType) { case MISSING_ELEMENT_MATCH_START: finalizeElement (sdata, ac+1); sdata->skipDeep = 2; break; case UNEXPECTED_ELEMENT: sdata->skipDeep = 1; break; case DOM_KEYCONSTRAINT: case MISSING_ATTRIBUTE: case MISSING_ELEMENT_MATCH_END: case MISSING_ELEMENT_MATCH_TEXT: case MISSING_TEXT_MATCH_START: case MISSING_TEXT_MATCH_END: case UNEXPECTED_ROOT_ELEMENT: case UNKNOWN_ATTRIBUTE: case INVALID_KEYREF_MATCH_START: case INVALID_KEYREF_MATCH_END: case INVALID_KEYREF_MATCH_TEXT: case UNKNOWN_ROOT_ELEMENT: case UNKOWN_GLOBAL_ID: case UNKOWN_ID: case INVALID_ATTRIBUTE_VALUE: case INVALID_VALUE: break; } return 1; } /* The cp argument must be type SCHEMA_CTYPE_TEXT */ static int checkText ( Tcl_Interp *interp, ................................................................................ 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, MISSING_TEXT_MATCH_START, name, namespace, NULL, ac)) { mayskip = 1; break; } return 0; } } break; case SCHEMA_CTYPE_ANY: ................................................................................ if (rc == -1) mayskip = 1; break; case SCHEMA_CTYPE_KEYSPACE_END: candidate->keySpace->active--; if (!candidate->keySpace->active) { if (candidate->keySpace->unknownIDrefs) { if (!recover (interp, sdata, INVALID_KEYREF_MATCH_START, name, namespace, NULL, ac)) { 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, MISSING_ELEMENT_MATCH_START, name, namespace, NULL, ac)) { /* Skip the just opened element tag and the following * content of the current. */ return 1; } return 0; } ac++; hm = 0; } if (isName) { if (recover (interp, sdata, UNEXPECTED_ELEMENT, name, namespace, NULL, 0)) { /* Skip the just opened element tag and the following * content of the current. */ return 1; } return 0; } return -1; ................................................................................ case SCHEMA_CTYPE_KEYSPACE: Tcl_Panic ("Keyspace constraint child of INTERLEAVE"); break; } } if (mayskip) break; if (recover (interp, sdata, MISSING_ELEMENT_MATCH_START, name, namespace, NULL, cp->nc)) { return 1; } return 0; } return -1; } ................................................................................ } } if (sdata->validationState == VALIDATION_READY) { /* The root of the tree to check. */ if (sdata->start) { if (strcmp (name, sdata->start) != 0) { if (recover (interp, sdata, UNEXPECTED_ROOT_ELEMENT, name, namespace, NULL, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element doesn't match"); return TCL_ERROR; } if (namespace) { if (!sdata->startNamespace|| strcmp (namespace, sdata->startNamespace) != 0) { if (recover (interp, sdata, UNEXPECTED_ROOT_ELEMENT, name, namespace, NULL, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element namespace doesn't match"); return TCL_ERROR; } } else { if (sdata->startNamespace) { if (recover (interp, sdata, UNEXPECTED_ROOT_ELEMENT, name, namespace, NULL, 0)) { sdata->validationState = VALIDATION_FINISHED; return TCL_OK; } SetResult ("Root element namespace doesn't match"); return TCL_ERROR; } } ................................................................................ } if (sdata->stack) { SchemaValidationStack *se; se = sdata->stack; if (se->pattern->type == SCHEMA_CTYPE_NAME && se->activeChild >= se->pattern->nc) { if (recover (interp, sdata, UNEXPECTED_ELEMENT, name, namespace, NULL, se->pattern->nc)) { return TCL_OK; } SetResult ("Unexpected child element \""); if (namespacePtr) { Tcl_AppendResult (interp, namespacePtr, ":", NULL); } Tcl_AppendResult (interp, name, "\" for element \"", NULL); ................................................................................ } Tcl_AppendResult (interp, name, "\"", NULL); return TCL_ERROR; } } else { sdata->validationState = VALIDATION_STARTED; if (!pattern) { if (recover (interp, sdata, UNKNOWN_ROOT_ELEMENT, name, namespace, NULL, 0)) { sdata->skipDeep = 1; return TCL_OK; } SetResult ("Unknown element"); return TCL_ERROR; } pushToStack (sdata, pattern, 0); ................................................................................ cp = sdata->stack->pattern; *isrequiered = 0; for (i = 0; i < cp->numAttr; i++) { if (cp->attrs[i]->namespace == ns && cp->attrs[i]->name == name) { if (cp->attrs[i]->cp) { if (!checkText (interp, cp->attrs[i]->cp, value)) { if (!recover (interp, sdata, INVALID_ATTRIBUTE_VALUE, name, ns, value, i)) { SetResult3V ("Attribute value doesn't match for " "attribute '", name , "'"); return 0; } } } if (cp->attrs[i]->required) *isrequiered = 1; ................................................................................ } else { ns = NULL; } found = probeAttribute (interp, sdata, ln, ns, atPtr[1], &req); reqAttr += req; unknowncleanup: if (!found) { if (!recover (interp, sdata, UNKNOWN_ATTRIBUTE, ln, namespace, NULL, 0)) { SetResult3V ("Unknown attribute \"", atPtr[0], "\""); return TCL_ERROR; } } if (nsatt) namespace[j] = '\xFF'; } if (reqAttr != cp->numReqAttr) { ................................................................................ } if (strcmp (atPtr[0], cp->attrs[i]->name) == 0) { found = 1; break; } } if (!found) { if (!recover (interp, sdata, MISSING_ATTRIBUTE, cp->attrs[i]->name, cp->attrs[i]->namespace, NULL, i)) { 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); } } ................................................................................ } else { ns = NULL; } found = probeAttribute (interp, sdata, ln, ns, atPtr->nodeValue, &req); reqAttr += req; unknown: if (!found) { if (!recover (interp, sdata, UNKNOWN_ATTRIBUTE, ln, ns, NULL, 0)) { if (!sdata->evalError) { if (ns) { SetResult ("Unknown attribute \""); Tcl_AppendResult (interp, ns, ":", atPtr->nodeName, "\""); } else { SetResult3 ("Unknown attribute \"", atPtr->nodeName, ................................................................................ found = 1; break; } nextAttr2: atPtr = atPtr->nextSibling; } if (!found) { if (!recover (interp, sdata, MISSING_ATTRIBUTE, cp->attrs[i]->name, cp->attrs[i]->namespace, NULL, i)) { if (!sdata->evalError) { 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, ................................................................................ ns = Tcl_GetHashKey (&sdata->namespace, h); } found = probeAttribute (interp, sdata, name, ns, Tcl_GetString (attvalue), &req); reqAttr += req; unknown: if (!found) { if (!recover (interp, sdata, UNKNOWN_ATTRIBUTE, Tcl_GetString (attname), Tcl_GetString (attns), NULL, 0)) { if (ns) { SetResult ("Unknown attribute \""); Tcl_AppendResult (interp, ns, ":", name, "\""); } else { SetResult3 ("Unknown attribute \"", name, "\""); } ................................................................................ } switch (cp->content[ac]->type) { case SCHEMA_CTYPE_KEYSPACE_END: cp->content[ac]->keySpace->active--; if (!cp->content[ac]->keySpace->active) { if (cp->content[ac]->keySpace->unknownIDrefs) { if (!recover (interp, sdata, INVALID_KEYREF_MATCH_END, NULL, NULL, cp->content[ac]->keySpace->name, 0)) { return 0; } cp->content[ac]->keySpace->unknownIDrefs = 0; } Tcl_DeleteHashTable (&cp->content[ac]->keySpace->ids); } break; ................................................................................ cp->content[ac]->keySpace->active++; } break; case SCHEMA_CTYPE_TEXT: if (cp->content[ac]->nc) { if (!checkText (interp, cp->content[ac], "")) { if (recover (interp, sdata, MISSING_TEXT_MATCH_END, NULL, NULL, NULL, ac)) { break; } return 0; } } break; ................................................................................ case SCHEMA_CTYPE_CHOICE: Tcl_Panic ("Invalid CTYPE in MIXED or CHOICE"); } if (mayMiss) break; } if (mayMiss) break; if (!recover (interp, sdata, MISSING_ELEMENT_MATCH_END, NULL, NULL, NULL, 0)) { return 0; } break; case SCHEMA_CTYPE_VIRTUAL: if (evalVirtual (interp, sdata, ac)) break; else return 0; ................................................................................ pushToStack (sdata, cp->content[ac], ac); rc = checkElementEnd (interp, sdata); popStack (sdata); if (rc) break; return 0; case SCHEMA_CTYPE_ANY: case SCHEMA_CTYPE_NAME: if (recover (interp, sdata, MISSING_ELEMENT_MATCH_END, NULL, NULL, NULL, 0)) { break; } return 0; } ac++; } if (isName) return 1; ................................................................................ /* 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, MISSING_ELEMENT_MATCH_END, NULL, NULL, NULL, 0)) { break; } return 0; } } return -1; } ................................................................................ Tcl_HashEntry *h, *h1; Tcl_HashSearch search, search1; int haveErrMsg = 0; SchemaDocKey *dk; if (sdata->evalError) return 0; if (sdata->unknownIDrefs) { if (!recover (interp, sdata, UNKOWN_ID, NULL, NULL, NULL, 0)) { haveErrMsg = 1; SetResult ("References to unknown IDs:"); for (h = Tcl_FirstHashEntry (&sdata->ids, &search); h != NULL; h = Tcl_NextHashEntry (&search)) { if (Tcl_GetHashValue (h) == 0) { Tcl_AppendResult (interp, " '", ................................................................................ } if (sdata->idTables.numEntries) { for (h = Tcl_FirstHashEntry (&sdata->idTables, &search); h != NULL; h = Tcl_NextHashEntry (&search)) { dk = Tcl_GetHashValue (h); if (dk->unknownIDrefs) { if (!recover (interp, sdata, UNKOWN_GLOBAL_ID, NULL, NULL, NULL, 0)) { if (haveErrMsg) { Tcl_AppendResult (interp, "\n", NULL); } else { haveErrMsg = 1; } Tcl_AppendResult (interp, "References to unknown IDs in ID space '", ................................................................................ switch (candidate->type) { case SCHEMA_CTYPE_TEXT: if (checkText (interp, candidate, text)) { updateStack (se, cp, ac); return 1; } if (sdata->evalError) return 0; if (recover (interp, sdata, INVALID_VALUE, NULL, NULL, text, ac)) { updateStack (se, cp, ac); return 1; } else { return 0; } SetResult ("Invalid text content"); return 0; ................................................................................ case SCHEMA_CTYPE_KEYSPACE: Tcl_Panic ("Keyspace constrain in MIXED or" " CHOICE"); } } if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, MISSING_ELEMENT_MATCH_TEXT, NULL, NULL, text, 0)) { break; } SetResultV ("Unexpected text content"); return 0; } break; ................................................................................ pushToStack (sdata, candidate, ac); if (matchText (interp, sdata, text)) { updateStack (se, cp, ac); return 1; } popStack (sdata); if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, MISSING_ELEMENT_MATCH_TEXT, NULL, NULL, text, 0)) { break; } SetResultV ("Unexpected text content"); return 0; } break; ................................................................................ } break; case SCHEMA_CTYPE_KEYSPACE_END: cp->content[ac]->keySpace->active--; if (!cp->content[ac]->keySpace->active) { if (cp->content[ac]->keySpace->unknownIDrefs) { if (!recover (interp, sdata, INVALID_KEYREF_MATCH_TEXT, NULL, NULL, text, ac)) { return 0; } cp->content[ac]->keySpace->unknownIDrefs = 0; } Tcl_DeleteHashTable (&cp->content[ac]->keySpace->ids); } break; case SCHEMA_CTYPE_NAME: case SCHEMA_CTYPE_ANY: if (mustMatch (cp->quants[ac], hm)) { if (recover (interp, sdata, MISSING_ELEMENT_MATCH_TEXT, NULL, NULL, text, ac)) { break; } SetResultV ("Unexpected text content"); return 0; } break; } ac++; } if (isName) { if (recover (interp, sdata, MISSING_ELEMENT_MATCH_TEXT, NULL, NULL, text, 0)) { return 1; } SetResultV ("Unexpected text content"); return 0; } popStack (sdata); continue; ................................................................................ } if (frs.type == EmptyResult || frs.nr_nodes == 0) { if (kc->flags & DKC_FLAG_IGNORE_EMPTY_FIELD_SET) { continue; } Tcl_CreateHashEntry (&htable, "", &hnew); if (!hnew) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } continue; } if (frs.nr_nodes != 1) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType != ELEMENT_NODE && frs.nodes[0]->nodeType != ATTRIBUTE_NODE) { ................................................................................ SetResult ("INVALID_DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType == ATTRIBUTE_NODE) { attr = (domAttrNode *) frs.nodes[0]; Tcl_CreateHashEntry (&htable, attr->nodeValue, &hnew); if (!hnew) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } else { keystr = xpathGetStringValue (frs.nodes[0], &len); Tcl_CreateHashEntry (&htable, keystr, &hnew); FREE(keystr); if (!hnew) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } } else { ................................................................................ continue; } if (first) first = 0; else Tcl_DStringAppend (&dStr, ":", 1); continue; } if (frs.nr_nodes != 1) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { skip = 1; break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } if (frs.nodes[0]->nodeType != ELEMENT_NODE ................................................................................ keystr = xpathGetStringValue (frs.nodes[0], &len); Tcl_DStringAppend (&dStr, keystr, len); } } if (skip) break; Tcl_CreateHashEntry (&htable, Tcl_DStringValue (&dStr), &hnew); if (!hnew) { if (recover (interp, sdata, DOM_KEYCONSTRAINT, NULL, NULL, NULL, 0)) { break; } SetResult ("DOM_KEYCONSTRAINT"); goto errorCleanup; } } } ................................................................................ SchemaKeySpace *ks; while (sdata->stack) popStack (sdata); while (sdata->lastMatchse) popFromStack (sdata, &sdata->lastMatchse); sdata->validationState = VALIDATION_READY; sdata->skipDeep = 0; sdata->evalError = 0; sdata->vaction = 0; Tcl_DStringSetLength (sdata->cdata, 0); if (sdata->ids.numEntries) { Tcl_DeleteHashTable (&sdata->ids); Tcl_InitHashTable (&sdata->ids, TCL_STRING_KEYS); sdata->unknownIDrefs = 0; } if (sdata->idTables.numEntries) { ................................................................................ SchemaValidationStack *se; void *ns; Tcl_Obj *rObj; Tcl_HashTable localHash; static const char *schemaInstanceInfoMethods[] = { "validationstate", "vstate", "definedElements", "stack", "toplevel", "pastexpected", "nextexpected", "definition", "validationaction", "vaction", NULL }; enum schemaInstanceInfoMethod { m_validationstate, m_vstate, m_definedElements, m_stack, m_toplevel, m_pastexpected, m_nextexpected, m_definition, m_validationaction, m_vaction }; static const char *schemaInstanceInfoStackMethods[] = { "top", "inside", NULL }; enum schemaInstanceInfoStackMethod { m_top, m_inside }; static const char *schemaInstanceInfoVactionMethods[] = { "name", "namespace", "text", NULL }; enum schemaInstanceInfoVactionMethod { m_name, m_namespace, m_text }; if (objc < 2) { Tcl_WrongNumArgs (interp, 1, objv, "subcommand ?arguments?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj (interp, objv[1], schemaInstanceInfoMethods, ................................................................................ Tcl_SetObjResult (interp, rObj); return TCL_OK; break; } case m_toplevel: if (objc != 2) { Tcl_WrongNumArgs (interp, 2, objv, ""); return TCL_ERROR; } if (!sdata->currentEvals) { SetResult ("not called while schema evaluation"); return TCL_ERROR; } if (!sdata->defineToplevel && sdata->currentEvals > 1) { ................................................................................ SetBooleanResult (0); } else { SetBooleanResult (1); } return TCL_OK; case m_nextexpected: if (objc != 2) { Tcl_WrongNumArgs (interp, 2, objv, ""); return TCL_ERROR; } if (sdata->validationState == VALIDATION_ERROR || sdata->validationState == VALIDATION_FINISHED) { return TCL_OK; } if (!sdata->stack) { if (sdata->start) { Tcl_AppendElement (interp, sdata->start); ................................................................................ Tcl_SetObjResult (interp, unifyMatchList (interp, &localHash, rObj)); Tcl_DecrRefCount (rObj); } return TCL_OK; case m_pastexpected: if (objc != 2) { Tcl_WrongNumArgs (interp, 2, objv, ""); return TCL_ERROR; } if (sdata->validationState == VALIDATION_READY || !sdata->stack) return TCL_OK; se = sdata->lastMatchse; if (!se) se = sdata->stack; rObj = Tcl_NewObj(); Tcl_InitHashTable (&localHash, TCL_ONE_WORD_KEYS); getNextExpected (sdata, se, interp, &localHash, rObj); ................................................................................ if (cp->namespace) { Tcl_AppendElement (interp, cp->namespace); } if (cp->defScript) { Tcl_AppendElement (interp, Tcl_GetString (cp->defScript)); } break; case m_vaction: case m_validationaction: if (objc == 2) { SetResult (ValidationAction2str[sdata->vaction]); break; } if (objc != 3) { Tcl_WrongNumArgs (interp, 2, objv, "?name|namespace|text?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj (interp, objv[2], schemaInstanceInfoVactionMethods, "method", 0, &methodIndex) != TCL_OK) { return TCL_ERROR; } switch ((enum schemaInstanceInfoVactionMethod) methodIndex) { case m_name: SetResult (sdata->vname); break; case m_namespace: SetResult (sdata->vns); break; case m_text: SetResult (sdata->vtext); break; } break; } return TCL_OK; } int schemaInstanceCmd ( ClientData clientData, ................................................................................ } for (i = 0; i < nrKeyspaces; i++) { Tcl_ListObjIndex (interp, objv[1], i, &ksObj); h = Tcl_CreateHashEntry (&sdata->keySpaces, Tcl_GetString (ksObj), &hnew); if (hnew) { ks = TMALLOC (SchemaKeySpace); ks->name = Tcl_GetHashKey (&sdata->keySpaces, h); ks->active = 0; ks->unknownIDrefs = 0; Tcl_SetHashValue (h, ks); } else { ks = Tcl_GetHashValue (h); } pattern = initSchemaCP (SCHEMA_CTYPE_KEYSPACE, |
Changes to generic/schema.h.
84
85
86
87
88
89
90
91
92
93
94
95
96
97
...
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
int nrFields; int flags; struct domKeyConstraint *next; } domKeyConstraint; typedef struct { int active; Tcl_HashTable ids; int unknownIDrefs; } SchemaKeySpace; typedef struct SchemaCP { ................................................................................ SchemaAttr **currentAttrs; unsigned int numAttr; unsigned int numReqAttr; unsigned int attrSize; SchemaValidationStack *stack; SchemaValidationStack *stackPool; ValidationState validationState; unsigned int skipDeep; Tcl_DString *cdata; Tcl_HashTable ids; int unknownIDrefs; Tcl_HashTable idTables; Tcl_HashTable keySpaces; } SchemaData; int schemaInstanceCmd ( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ); int tDOM_SchemaObjCmd ( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ); void tDOM_SchemaInit ( |
>
>
>
>
>
<
<
<
<
<
<
<
|
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
...
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
|
int nrFields; int flags; struct domKeyConstraint *next; } domKeyConstraint; typedef struct { char *name; int active; Tcl_HashTable ids; int unknownIDrefs; } SchemaKeySpace; typedef struct SchemaCP { ................................................................................ SchemaAttr **currentAttrs; unsigned int numAttr; unsigned int numReqAttr; unsigned int attrSize; SchemaValidationStack *stack; SchemaValidationStack *stackPool; ValidationState validationState; int vaction; const char *vname; const char *vns; const char *vtext; unsigned int skipDeep; Tcl_DString *cdata; Tcl_HashTable ids; int unknownIDrefs; Tcl_HashTable idTables; Tcl_HashTable keySpaces; } SchemaData; int schemaInstanceCmd ( ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[] ); void tDOM_SchemaInit ( |
Changes to tests/schema.test.
5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 .... 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 .... 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 .... 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 .... 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 .... 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 |
} 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 } ................................................................................ {<doc><items><b/><a/><c/></items><items><b/><c/></items><items><a/><b/><c/></items></doc>} {<doc><items><b/><a/><c/></items><items><a/><c/></items><items><b/><a/></items></doc>} } { lappend result [s validate $xml] } s delete set result } {tclcallback 1 tclcallback tclcallback 1 tclcallback s MISSING_ONE_OF_INTERLEAVE tclcallback 1 tclcallback s MISSING_ONE_OF_INTERLEAVE tclcallback s MISSING_ELEMENT 1} test schema-18.8 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><items><a/><b/><c/></items><items><a/><c/></items><items><b/><a/></items></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_CP s MISSING_CP 1} test schema-18.9 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><a/><b/><c/><a/><c/><b/><a/></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_CP 1} test schema-18.10 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><a/><b/><c/><a/><b/><a/></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_CP 1} test schema-18.11 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ <doc><a/><b/><b/><c/></doc> <doc><a/><b/><c/><e/></doc> } { lappend result [s validate $xml] } s delete set result } {1 s MISSING_CP 1 s MISSING_CP 1 s MISSING_CP 1 s MISSING_CP 1 s UNEXPECTED_ELEMENT 1} proc validatedSAX {g xml {keepEmpties 1}} { set args [list -validateCmd $g] if {!$keepEmpties} { lappend args -ignorewhitespace 1 } xml::parser p {*}$args |
| | | | | | |
5424 5425 5426 5427 5428 5429 5430 5431 5432 5433 5434 5435 5436 5437 5438 .... 5563 5564 5565 5566 5567 5568 5569 5570 5571 5572 5573 5574 5575 5576 5577 .... 5589 5590 5591 5592 5593 5594 5595 5596 5597 5598 5599 5600 5601 5602 5603 .... 5614 5615 5616 5617 5618 5619 5620 5621 5622 5623 5624 5625 5626 5627 5628 .... 5641 5642 5643 5644 5645 5646 5647 5648 5649 5650 5651 5652 5653 5654 5655 .... 5669 5670 5671 5672 5673 5674 5675 5676 5677 5678 5679 5680 5681 5682 5683 |
} s reportcmd schema-18 set result "" set rc [s validate {<doc><a/><c/></doc>}] lappend result $rc s delete set result } {s MISSING_ELEMENT 1} test schema-18.3 {reportcmd} { tdom::schema s s define { defelement doc { element a } ................................................................................ {<doc><items><b/><a/><c/></items><items><b/><c/></items><items><a/><b/><c/></items></doc>} {<doc><items><b/><a/><c/></items><items><a/><c/></items><items><b/><a/></items></doc>} } { lappend result [s validate $xml] } s delete set result } {tclcallback 1 tclcallback tclcallback 1 tclcallback s MISSING_ELEMENT tclcallback 1 tclcallback s MISSING_ELEMENT tclcallback s MISSING_ELEMENT 1} test schema-18.8 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><items><a/><b/><c/></items><items><a/><c/></items><items><b/><a/></items></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_ELEMENT s MISSING_ELEMENT 1} test schema-18.9 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><a/><b/><c/><a/><c/><b/><a/></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_ELEMENT 1} test schema-18.10 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ foreach xml { {<doc><a/><b/><c/><a/><b/><a/></doc>} } { lappend result [s validate $xml] } s delete set result } {s MISSING_ELEMENT 1} test schema-18.11 {reportcmd} { tdom::schema s s define { defelement a {} defelement b {} defelement c {} ................................................................................ <doc><a/><b/><b/><c/></doc> <doc><a/><b/><c/><e/></doc> } { lappend result [s validate $xml] } s delete set result } {1 s MISSING_ELEMENT 1 s MISSING_ELEMENT 1 s MISSING_ELEMENT 1 s MISSING_ELEMENT 1 s UNEXPECTED_ELEMENT 1} proc validatedSAX {g xml {keepEmpties 1}} { set args [list -validateCmd $g] if {!$keepEmpties} { lappend args -ignorewhitespace 1 } xml::parser p {*}$args |