Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | wip |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | expected-onlymandatory |
| Files: | files | file ages | folders |
| SHA3-256: |
366abdbead5fe424ca488709478df6e3 |
| User & Date: | rolf 2020-04-30 01:12:17 |
Context
|
2020-05-01
| ||
| 14:12 | Corrected typo. check-in: 0248883e86 user: rolf tags: expected-onlymandatory | |
|
2020-04-30
| ||
| 01:12 | wip check-in: 366abdbead user: rolf tags: expected-onlymandatory | |
|
2020-04-29
| ||
| 18:15 | Merged from schema. check-in: 2da09eb05d user: rolf tags: expected-onlymandatory | |
Changes
Changes to generic/schema.c.
1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 .... 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 .... 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 .... 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 .... 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 .... 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 .... 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 .... 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 .... 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 .... 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 .... 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 .... 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 .... 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 |
popStack (sdata);
/* cp is still the pattern from stack top before the popStack */
if (cp->type != SCHEMA_CTYPE_NAME) {
finalizeElement (sdata, sdata->stack->activeChild + 1);
}
}
static void
rewindStack (
SchemaData *sdata
)
{
SchemaValidationStack *se;
................................................................................
sdata->currentEvals--;
if (rc != TCL_OK) {
sdata->evalError = 1;
return 0;
}
return 1;
}
static int
matchElementStart (
Tcl_Interp *interp,
SchemaData *sdata,
char *name,
char *namespace
................................................................................
return 1;
}
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of MIXED or CHOICE");
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, icp);
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
................................................................................
case SCHEMA_CTYPE_VIRTUAL:
if (evalVirtual (interp, sdata, ac)) {
hm = 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 (sdata, se, ac);
return 1;
}
popStack (sdata);
................................................................................
return 1;
}
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of INTERLEAVE");
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, icp);
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
if (!(sdata->recoverFlags & RECOVER_FLAG_REWIND)) {
se->hasMatched = 1;
se->interleaveState[i] = 1;
}
................................................................................
mayskip = 1;
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
continue;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, ic);
if (checkElementEnd (interp, sdata)) {
mayskip = 1;
}
popStack (sdata);
break;
................................................................................
}
break;
case SCHEMA_CTYPE_VIRTUAL:
if (evalVirtual (interp, sdata, 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;
if (!recover (interp, sdata, MISSING_ELEMENT_MATCH_END, NULL,
NULL, NULL, 0)) {
return 0;
................................................................................
}
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
break;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, ic);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
break;
................................................................................
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, candidate);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
if (mustMatch (cp->quants[ac], hm)) {
................................................................................
}
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
break;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
pushToStack (sdata, ic);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
break;
................................................................................
if (!(expectedFlags & EXPECTED_ONLY_MANDATORY)
|| minOne (cp->quants[ac])) {
Tcl_ListObjAppendElement (
interp, rObj, serializeElementName (interp, ic)
);
}
break;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
if (expectedFlags & EXPECTED_ONLY_MANDATORY
&& !se->hasMatched) {
expectedFlags |= EXPECTED_PROBE_MAYSKIP;
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (sdata, se1, interp,
seenCPs, rObj,
expectedFlags);
................................................................................
for (i = 0; i < ic->nc; i++) {
if (mayMiss (ic->quants[i])) {
mayskip = 1;
break;
}
jc = ic->content[i];
switch (jc->type) {
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (
sdata, se1, interp, seenCPs, rObj,
expectedFlags
);
repoolStackElement (sdata, se1);
break;
................................................................................
if (!(expectedFlags & EXPECTED_ONLY_MANDATORY)
|| minOne (cp->quants[i])) {
Tcl_ListObjAppendElement (
interp, rObj, serializeElementName (interp, jc)
);
}
break;
case SCHEMA_CTYPE_INTERLEAVE:
case SCHEMA_CTYPE_PATTERN:
Tcl_CreateHashEntry (seenCPs, jc, &hnew);
if (hnew) {
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (
sdata, se1, interp, seenCPs, rObj,
expectedFlags
);
|
< < > > > > > > > > > > > > > > > > > > > > | > > > > > | | > > > > > | | > > > > > | | > > > > > | | > > > > > | | > > > > | | > > > > | | > > > > | | > > > > | | > > > > > | | > > > > | |
1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 .... 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 .... 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 .... 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 .... 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 .... 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 .... 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 .... 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 .... 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 .... 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 .... 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 .... 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 .... 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 |
popStack (sdata);
/* cp is still the pattern from stack top before the popStack */
if (cp->type != SCHEMA_CTYPE_NAME) {
finalizeElement (sdata, sdata->stack->activeChild + 1);
}
}
static void
rewindStack (
SchemaData *sdata
)
{
SchemaValidationStack *se;
................................................................................
sdata->currentEvals--;
if (rc != TCL_OK) {
sdata->evalError = 1;
return 0;
}
return 1;
}
/* Check, if the pattern to probe does not call itself (even
* indirectly) without a match inbetween.*/
static int inline
recursivePattern (
SchemaValidationStack *se,
SchemaCP *pattern
)
{
int rc = 0;
while (se && se->pattern->type != SCHEMA_CTYPE_NAME) {
if (!se->hasMatched && se->pattern == pattern) {
rc = 1;
break;
}
se = se->down;
}
return rc;
}
static int
matchElementStart (
Tcl_Interp *interp,
SchemaData *sdata,
char *name,
char *namespace
................................................................................
return 1;
}
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of MIXED or CHOICE");
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, icp)) {
mayskip = 1;
continue;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, icp);
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
................................................................................
case SCHEMA_CTYPE_VIRTUAL:
if (evalVirtual (interp, sdata, ac)) {
hm = 1;
break;
}
else return 0;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, candidate)) {
mayskip = 1;
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, candidate);
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
................................................................................
return 1;
}
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of INTERLEAVE");
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, icp)) {
mayskip = 1;
continue;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, icp);
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
if (!(sdata->recoverFlags & RECOVER_FLAG_REWIND)) {
se->hasMatched = 1;
se->interleaveState[i] = 1;
}
................................................................................
mayskip = 1;
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
continue;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, ic)) {
mayskip = 1;
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, ic);
if (checkElementEnd (interp, sdata)) {
mayskip = 1;
}
popStack (sdata);
break;
................................................................................
}
break;
case SCHEMA_CTYPE_VIRTUAL:
if (evalVirtual (interp, sdata, ac)) break;
else return 0;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, cp->content[ac])) {
mayskip = 1;
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, cp->content[ac]);
rc = checkElementEnd (interp, sdata);
popStack (sdata);
if (rc) break;
if (!recover (interp, sdata, MISSING_ELEMENT_MATCH_END, NULL,
NULL, NULL, 0)) {
return 0;
................................................................................
}
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
break;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, ic)) {
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, ic);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
break;
................................................................................
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, candidate)) {
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, candidate);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
if (mustMatch (cp->quants[ac], hm)) {
................................................................................
}
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
break;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, ic)) {
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
pushToStack (sdata, ic);
if (matchText (interp, sdata, text)) {
updateStack (sdata, se, ac);
return 1;
}
popStack (sdata);
break;
................................................................................
if (!(expectedFlags & EXPECTED_ONLY_MANDATORY)
|| minOne (cp->quants[ac])) {
Tcl_ListObjAppendElement (
interp, rObj, serializeElementName (interp, ic)
);
}
break;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, ic)) {
break;
}
/* Fall through */
case SCHEMA_CTYPE_INTERLEAVE:
if (expectedFlags & EXPECTED_ONLY_MANDATORY
&& !se->hasMatched) {
expectedFlags |= EXPECTED_PROBE_MAYSKIP;
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (sdata, se1, interp,
seenCPs, rObj,
expectedFlags);
................................................................................
for (i = 0; i < ic->nc; i++) {
if (mayMiss (ic->quants[i])) {
mayskip = 1;
break;
}
jc = ic->content[i];
switch (jc->type) {
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, ic)) {
mayskip = 1;
break;
}
/* fall throu */
case SCHEMA_CTYPE_INTERLEAVE:
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (
sdata, se1, interp, seenCPs, rObj,
expectedFlags
);
repoolStackElement (sdata, se1);
break;
................................................................................
if (!(expectedFlags & EXPECTED_ONLY_MANDATORY)
|| minOne (cp->quants[i])) {
Tcl_ListObjAppendElement (
interp, rObj, serializeElementName (interp, jc)
);
}
break;
case SCHEMA_CTYPE_PATTERN:
if (recursivePattern (se, jc)) {
break;
}
/* Fall through */
case SCHEMA_CTYPE_INTERLEAVE:
Tcl_CreateHashEntry (seenCPs, jc, &hnew);
if (hnew) {
se1 = getStackElement (sdata, ic);
mayskip = getNextExpectedWorker (
sdata, se1, interp, seenCPs, rObj,
expectedFlags
);
|