Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | wip |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | wip |
| Files: | files | file ages | folders |
| SHA3-256: |
899c21f84bdec55ff28f30082ac80f5f |
| User & Date: | rolf 2020-03-15 01:20:36 |
Context
|
2020-03-16
| ||
| 00:38 | Save work. check-in: d70281b9c7 user: rolf tags: wip | |
|
2020-03-15
| ||
| 01:20 | wip check-in: 899c21f84b user: rolf tags: wip | |
|
2020-03-14
| ||
| 12:05 | Merged from schema. check-in: ee3147fc64 user: rolf tags: wip | |
Changes
Changes to generic/schema.c.
2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 .... 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 .... 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 .... 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 |
" CHOICE");
}
}
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, 0)) {
break;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_INTERLEAVE:
................................................................................
updateStack (sdata, cp, ac);
return 1;
}
popStack (sdata);
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, 0)) {
break;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_VIRTUAL:
................................................................................
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, ac)) {
break;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
}
................................................................................
break;
}
}
if (!mayskip) {
if (recover (interp, sdata, UNEXPECTED_TEXT, NULL, NULL, text,
ac)) {
break;
}
SetResultV ("Unexpected text content");
return 0;
}
popStack (sdata);
se = sdata->stack;
getContext (cp, ac, hm);
|
| | | | |
2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 .... 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 .... 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 .... 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 |
" CHOICE");
}
}
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, 0)) {
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_INTERLEAVE:
................................................................................
updateStack (sdata, cp, ac);
return 1;
}
popStack (sdata);
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, 0)) {
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
case SCHEMA_CTYPE_VIRTUAL:
................................................................................
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
if (mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, UNEXPECTED_TEXT,
NULL, NULL, text, ac)) {
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
break;
}
................................................................................
break;
}
}
if (!mayskip) {
if (recover (interp, sdata, UNEXPECTED_TEXT, NULL, NULL, text,
ac)) {
return 1;
}
SetResultV ("Unexpected text content");
return 0;
}
popStack (sdata);
se = sdata->stack;
getContext (cp, ac, hm);
|
Changes to tests/schema.test.
7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 |
s reportcmd appendtoresult
s define $def
lappend result [s validate {<doc>unexpected text<e/></doc>}]
s delete
}
set result
} {UNEXPECTED_TEXT 1 UNEXPECTED_TEXT 1}
proc validatedSAX {g xml {keepEmpties 1}} {
set args [list -validateCmd $g]
if {!$keepEmpties} {
lappend args -ignorewhitespace 1
}
xml::parser p {*}$args
|
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > |
7705 7706 7707 7708 7709 7710 7711 7712 7713 7714 7715 7716 7717 7718 7719 7720 7721 7722 7723 7724 7725 7726 7727 7728 7729 7730 7731 7732 7733 7734 7735 7736 7737 7738 7739 7740 7741 7742 7743 7744 7745 7746 7747 7748 7749 7750 7751 7752 7753 7754 7755 7756 7757 7758 7759 7760 7761 7762 7763 7764 7765 7766 7767 7768 7769 7770 7771 7772 7773 7774 7775 7776 7777 7778 7779 7780 7781 7782 |
s reportcmd appendtoresult
s define $def
lappend result [s validate {<doc>unexpected text<e/></doc>}]
s delete
}
set result
} {UNEXPECTED_TEXT 1 UNEXPECTED_TEXT 1}
test schema-18.17 {unexpected text} {
tdom::schema s
s reportcmd appendtoresult
s define {
defelement doc {
ref r1
element c ! {}
}
defpattern r1 {
element a ! {}
element b ! {}
}
}
set result [list]
foreach xml {
<doc>unexpected_text</doc>
<doc><a/>unexpected_text</doc>
<doc><a/><b/>unexpected_text</doc>
<doc><a/><b/><c/>unexpected_text</doc>
} {
lappend result [s validate $xml]
}
s delete
set result
} {}
test schema-18.18 {missing element} {
set defs {
{
defelement doc {
ref r1
}
defpattern r1 {
element a ! {}
element b ! {}
}
}
{
defelement doc {
element a 1 {}
element b 1 {}
}
}
{
defelement doc {
ref r1
}
defpattern r1 {
element a ! {}
element b ! {}
}
}
}
set result [list]
foreach def $defs {
tdom::schema s
s reportcmd appendtoresult
s define $def
lappend result [s validate {<doc/>}]
s delete
}
set result
} {}
proc validatedSAX {g xml {keepEmpties 1}} {
set args [list -validateCmd $g]
if {!$keepEmpties} {
lappend args -ignorewhitespace 1
}
xml::parser p {*}$args
|