Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | More work. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | keyspaces |
| Files: | files | file ages | folders |
| SHA3-256: |
8f37424ac1d0af37e6c33060fbcaedbf |
| User & Date: | rolf 2019-05-27 12:01:29.507 |
Context
|
2019-05-28
| ||
| 00:29 | Save work. check-in: 48be317469 user: rolf tags: keyspaces | |
|
2019-05-27
| ||
| 12:01 | More work. check-in: 8f37424ac1 user: rolf tags: keyspaces | |
|
2019-05-25
| ||
| 12:32 | Added the new CTYPE also to the debug functions. check-in: 9049114cc3 user: rolf tags: keyspaces | |
Changes
Changes to generic/schema.c.
| ︙ | ︙ | |||
293 294 295 296 297 298 299 300 301 302 |
pattern->quants = (SchemaQuant*) MALLOC (
sizeof (SchemaQuant) * CONTENT_ARRAY_SIZE_INIT
);
break;
case SCHEMA_CTYPE_TEXT:
/* content/quant will be allocated, if the cp in fact has
* constraints */
break;
case SCHEMA_CTYPE_VIRTUAL:
case SCHEMA_CTYPE_ANY:
| > > > > < > | 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 |
pattern->quants = (SchemaQuant*) MALLOC (
sizeof (SchemaQuant) * CONTENT_ARRAY_SIZE_INIT
);
break;
case SCHEMA_CTYPE_TEXT:
/* content/quant will be allocated, if the cp in fact has
* constraints */
break;
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
pattern->name = name;
break;
case SCHEMA_CTYPE_VIRTUAL:
case SCHEMA_CTYPE_ANY:
/* Do nothing */
break;
}
return pattern;
}
DDBG(
static void serializeCP (
SchemaCP *pattern
)
{
fprintf (stderr, "CP %p type: %s\n",
pattern, Schema_CP_Type2str[pattern->type]);
switch (pattern->type) {
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
fprintf (stderr, "\tName: '%s'\n", pattern->name);
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_PATTERN:
fprintf (stderr, "\tName: '%s' Namespace: '%s'\n",
pattern->name, pattern->namespace);
|
| ︙ | ︙ | |||
927 928 929 930 931 932 933 934 935 936 937 938 939 940 |
popStack (sdata);
if (rc == -1) mayskip = 1;
break;
case SCHEMA_CTYPE_VIRTUAL:
Tcl_Panic ("Virtual constrain in MIXED or CHOICE");
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constrain in MIXED or CHOICE");
}
if (!mayskip && mayMiss (candidate->quants[i]))
mayskip = 1;
}
| > | 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 |
popStack (sdata);
if (rc == -1) mayskip = 1;
break;
case SCHEMA_CTYPE_VIRTUAL:
Tcl_Panic ("Virtual constrain in MIXED or CHOICE");
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constrain in MIXED or CHOICE");
}
if (!mayskip && mayMiss (candidate->quants[i]))
mayskip = 1;
}
|
| ︙ | ︙ | |||
958 959 960 961 962 963 964 965 966 967 968 969 970 971 |
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
updateStack (se, cp, ac);
return 1;
}
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
}
if (!mayskip && mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, S("MISSING_CP"))) {
| > > > | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 |
rc = matchElementStart (interp, sdata, name, namespace);
if (rc == 1) {
updateStack (se, cp, ac);
return 1;
}
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE_END:
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
}
if (!mayskip && mustMatch (cp->quants[ac], hm)) {
if (recover (interp, sdata, S("MISSING_CP"))) {
|
| ︙ | ︙ | |||
987 988 989 990 991 992 993 994 995 996 997 998 999 1000 |
return 1;
}
return 0;
}
return -1;
case SCHEMA_CTYPE_KEYSPACE:
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!");
| > | 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 |
return 1;
}
return 0;
}
return -1;
case SCHEMA_CTYPE_KEYSPACE:
case SCHEMA_CTYPE_KEYSPACE_END:
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!");
|
| ︙ | ︙ | |||
1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 |
if (mayskip && rc != -1) mayskip = 0;
break;
case SCHEMA_CTYPE_VIRTUAL:
Tcl_Panic ("Virtual constraint child of INTERLEAVE");
break;
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constraint child of INTERLEAVE");
break;
}
}
| > | 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 |
if (mayskip && rc != -1) mayskip = 0;
break;
case SCHEMA_CTYPE_VIRTUAL:
Tcl_Panic ("Virtual constraint child of INTERLEAVE");
break;
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constraint child of INTERLEAVE");
break;
}
}
|
| ︙ | ︙ | |||
1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 |
DBG(fprintf (stderr, "ac %d hm %d mayMiss: %d\n",
ac, hm, mayMiss (cp->quants[ac])));
if (mayMiss (cp->quants[ac])) {
ac++; continue;
}
switch (cp->content[ac]->type) {
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_TEXT:
if (cp->content[ac]->nc) {
if (!checkText (interp, cp->content[ac], "")) {
if (recover (interp, sdata, S("MISSING_TEXT"))) {
| > > > | 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 |
DBG(fprintf (stderr, "ac %d hm %d mayMiss: %d\n",
ac, hm, mayMiss (cp->quants[ac])));
if (mayMiss (cp->quants[ac])) {
ac++; continue;
}
switch (cp->content[ac]->type) {
case SCHEMA_CTYPE_KEYSPACE_END:
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_TEXT:
if (cp->content[ac]->nc) {
if (!checkText (interp, cp->content[ac], "")) {
if (recover (interp, sdata, S("MISSING_TEXT"))) {
|
| ︙ | ︙ | |||
1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 |
pushToStack (sdata, ic);
if (checkElementEnd (interp, sdata)) {
mayMiss = 1;
}
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE:
case SCHEMA_CTYPE_VIRTUAL:
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("Invalid CTYPE in MIXED or CHOICE");
}
if (mayMiss) break;
| > | 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 |
pushToStack (sdata, ic);
if (checkElementEnd (interp, sdata)) {
mayMiss = 1;
}
popStack (sdata);
break;
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
case SCHEMA_CTYPE_VIRTUAL:
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("Invalid CTYPE in MIXED or CHOICE");
}
if (mayMiss) break;
|
| ︙ | ︙ | |||
1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 |
return 0;
}
ac++;
}
if (isName) return 1;
return -1;
case SCHEMA_CTYPE_KEYSPACE:
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!");
| > | 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 |
return 0;
}
ac++;
}
if (isName) return 1;
return -1;
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
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!");
|
| ︙ | ︙ | |||
1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 |
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");
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constrain in MIXED or CHOICE");
}
}
if (mustMatch (cp->quants[ac], hm)) {
SetResult ("Unexpected text content");
| > | 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 |
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");
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace constrain in MIXED or CHOICE");
}
}
if (mustMatch (cp->quants[ac], hm)) {
SetResult ("Unexpected text content");
|
| ︙ | ︙ | |||
1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 |
case SCHEMA_CTYPE_VIRTUAL:
if (!evalVirtual (interp, sdata, candidate)) return 0;
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
if (mustMatch (cp->quants[ac], hm)) {
SetResult ("Unexpected text content");
return 0;
| > > > > | 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 |
case SCHEMA_CTYPE_VIRTUAL:
if (!evalVirtual (interp, sdata, candidate)) return 0;
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_NAME:
case SCHEMA_CTYPE_ANY:
if (mustMatch (cp->quants[ac], hm)) {
SetResult ("Unexpected text content");
return 0;
|
| ︙ | ︙ | |||
1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 |
}
popStack (sdata);
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of INTERLEAVE");
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace child of INTERLEAVE");
case SCHEMA_CTYPE_VIRTUAL:
break;
}
}
case SCHEMA_CTYPE_KEYSPACE:
break;
}
break;
}
| > > > > > | 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 |
}
popStack (sdata);
break;
case SCHEMA_CTYPE_CHOICE:
Tcl_Panic ("MIXED or CHOICE child of INTERLEAVE");
case SCHEMA_CTYPE_KEYSPACE_END:
case SCHEMA_CTYPE_KEYSPACE:
Tcl_Panic ("Keyspace child of INTERLEAVE");
case SCHEMA_CTYPE_VIRTUAL:
break;
}
}
case SCHEMA_CTYPE_KEYSPACE:
break;
case SCHEMA_CTYPE_KEYSPACE:
break;
}
break;
}
|
| ︙ | ︙ | |||
3791 3792 3793 3794 3795 3796 3797 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[]
)
{
SchemaData *sdata = GETASI;
SchemaCP *pattern;
| | > | < | | | | | > > > > > > > > > > > | > | > | | 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 |
Tcl_Interp *interp,
int objc,
Tcl_Obj *const objv[]
)
{
SchemaData *sdata = GETASI;
SchemaCP *pattern;
int nrKeyspaces, i;
Tcl_Obj *ksObj;
CHECK_SI
CHECK_TOPLEVEL
checkNrArgs (3, 3, "Expected: <keyspace-name list> pattern");
if (sdata->cp->type != SCHEMA_CTYPE_NAME
&& sdata->cp->type != SCHEMA_CTYPE_PATTERN) {
SetResult ("The keyspace schema definition command is only "
"allowed in sequential context (defelement, "
"element or defpattern)");
return TCL_ERROR;
}
if (Tcl_ListObjLength (interp, objv[1], &nrKeyspaces) != TCL_OK) {
SetResult ("The <keyspace-name list> argument must be a valid tcl "
"list");
return TCL_ERROR;
}
for (i = 0; i < nrKeyspaces; i++) {
Tcl_ListObjIndex (interp, objv[1], i, &ksObj);
pattern = initSchemaCP (SCHEMA_CTYPE_KEYSPACE,
Tcl_GetString (ksObj), NULL);
REMEMBER_PATTERN (pattern);
addToContent (sdata, pattern, SCHEMA_CQUANT_ONE, 0, 0);
}
if (Tcl_EvalObjEx (interp, objv[2], TCL_EVAL_DIRECT) != TCL_OK) {
return TCL_ERROR;
}
for (i = 0; i < nrKeyspaces; i++) {
Tcl_ListObjIndex (interp, objv[1], i, &ksObj);
pattern = initSchemaCP (SCHEMA_CTYPE_KEYSPACE_END,
Tcl_GetString (ksObj), NULL);
REMEMBER_PATTERN (pattern);
addToContent (sdata, pattern, SCHEMA_CQUANT_ONE, 0, 0);
}
return TCL_OK;
}
static int
integerImpl (
Tcl_Interp *interp,
void *constraintData,
|
| ︙ | ︙ |