Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | wip |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | wip2 |
| Files: | files | file ages | folders |
| SHA3-256: |
46d498e3232944f06438b23e783ce8f3 |
| User & Date: | rolf 2020-03-13 01:55:42 |
Context
|
2020-03-14
| ||
| 02:49 | Merged from schema. check-in: 4582355609 user: rolf tags: wip2 | |
|
2020-03-13
| ||
| 01:55 | wip check-in: 46d498e323 user: rolf tags: wip2 | |
| 01:41 | wip check-in: ce15fc26c0 user: rolf tags: wip2 | |
Changes
Changes to generic/schema.c.
3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 |
)
{
int ac, hm, i, hnew, mustMatch, mayskip, rc = 1;
SchemaCP *cp, *ic, *jc;
SchemaValidationStack *se1;
getContext (cp, ac, hm);
if (ignoreMatched) {
ac++;
} else {
if (hm && maxOne(cp->quants[ac])) ac++;
}
switch (cp->type) {
case SCHEMA_CTYPE_INTERLEAVE:
ac = 0;
|
| |
3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 |
)
{
int ac, hm, i, hnew, mustMatch, mayskip, rc = 1;
SchemaCP *cp, *ic, *jc;
SchemaValidationStack *se1;
getContext (cp, ac, hm);
if (ignoreMatched && hm) {
ac++;
} else {
if (hm && maxOne(cp->quants[ac])) ac++;
}
switch (cp->type) {
case SCHEMA_CTYPE_INTERLEAVE:
ac = 0;
|
Changes to tests/schema.test.
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
....
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
|
set fromReportCmd ""
lappend result [s validate $xml]
lappend result {*}$fromReportCmd
}
s delete
set result
} {0 0 1 1 aaaa 1 b bb bbb bbbb 1}
test schema-17.16a {info expected} {
tdom::schema s
s defelement doc {
element a
group {
group {
................................................................................
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
lappend result [s validate $xml]
}
s reportcmd schema-17.13
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
set fromReportCmd ""
lappend result [s validate $xml]
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
|
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
....
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
|
set fromReportCmd ""
lappend result [s validate $xml]
lappend result {*}$fromReportCmd
}
s delete
set result
} {0 0 1 1 aaaa 1 b bb bbb bbbb 1}
test schema-17.16_1{info expected} {
tdom::schema s
s defelement doc {
element a
group {
group {
group {
element aaaa
element bbbb ?
}
element bbb ?
}
element bb ?
}
element b
}
set result [list]
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
lappend result [s validate $xml]
}
s reportcmd schema-17.13
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
set fromReportCmd ""
lappend result [s validate $xml]
lappend result {*}$fromReportCmd
}
s delete
set result
} {0 0 1 1 aaaa 1 b bb bbb bbbb 1}
test schema-17.16a {info expected} {
tdom::schema s
s defelement doc {
element a
group {
group {
................................................................................
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
lappend result [s validate $xml]
}
s reportcmd schema-17.13a
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
set fromReportCmd ""
lappend result [s validate $xml]
lappend result {*}$fromReportCmd
}
s delete
set result
} {0 0 1 1 aaaa b bb bbb bbbb 1 aaaa b bb bbb bbbb 1}
test schema-17.16a_1 {info expected} {
tdom::schema s
s defelement doc {
element a
group {
group {
group {
element aaaa *
element bbbb ?
}
element bbb ?
}
element bb ?
}
element b
}
set result [list]
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
lappend result [s validate $xml]
}
s reportcmd schema-17.13a
foreach xml {
<doc><a/></doc>
<doc><a/><aaaa/></doc>
<doc><a/><aaaa/><b/></doc>
} {
set fromReportCmd ""
lappend result [s validate $xml]
|