tDOM: Check-in [b0e429ebf8]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	wip
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| localkey
Files:	files \| file ages \| folders
SHA3-256:	b0e429ebf8dbbba16704d267ddcc7c5992ba6df95ed2bfb073933aeb388c609d
User & Date:	rolf 2019-05-09 14:27:04

Context

2019-05-09
19:16		Merged from schema. check-in: 4879bb492b user: rolf tags: localkey
14:27		wip check-in: b0e429ebf8 user: rolf tags: localkey
2019-05-07
22:52		Implementend restricted XPath expressions for local key selectors and fields. check-in: 918781e945 user: rolf tags: localkey

Changes

Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to generic/schema.c.

    ast t,
    int field,
    int toplevel
    )
{
    ast child;
    

    while (t) {
        switch (t->type) {
        case GetContextNode:
            if (!toplevel) {
                SetResult ("Not a reduced XPath expression.");
                return TCL_ERROR;
            }
            t = t->next;
            continue;
        case CombineSets:
            /* Only on top level? */
            if (!toplevel) {
                SetResult ("Not a reduced XPath expression.");
                return TCL_ERROR;
            }
            for (child = t->child; child != NULL; child = child->next) {
                if (processSchemaXPath (interp, child, field, 0) != TCL_OK) {
                    return TCL_ERROR;
................................................................................
            if (processSchemaXPath (interp, t->child, field, 0) != TCL_OK) {
                return TCL_ERROR;
            }
        }
        toplevel = 0;
        t = t->next;
    }
    /* printAst (0, t); */
    return TCL_OK;
}

static int
uniquePatternCmd (
    ClientData clientData,
    Tcl_Interp *interp,

    ast t,
    int field,
    int toplevel
    )
{
    ast child;
    
    printAst (0, t);
    while (t) {
        switch (t->type) {
        case GetContextNode:
            if (!toplevel) {
                SetResult ("Not a reduced XPath expression.");
                return TCL_ERROR;
            }
            t = t->next;
            continue;
        case CombineSets:

            if (!toplevel) {
                SetResult ("Not a reduced XPath expression.");
                return TCL_ERROR;
            }
            for (child = t->child; child != NULL; child = child->next) {
                if (processSchemaXPath (interp, child, field, 0) != TCL_OK) {
                    return TCL_ERROR;
................................................................................
            if (processSchemaXPath (interp, t->child, field, 0) != TCL_OK) {
                return TCL_ERROR;
            }
        }
        toplevel = 0;
        t = t->next;
    }

    return TCL_OK;
}

static int
uniquePatternCmd (
    ClientData clientData,
    Tcl_Interp *interp,

Changes to tests/schema.test.

    foreach selector {
        a
        ./../a
        /foo
        a/b
        {a | b}
        a|b

        .//a
        //a
        a/@ref
        a/b/c
        a//b/c
        (.//b|a)/c
    } {
................................................................................
        set ::schema-19.2 $selector
        tdom::schema s
        lappend result [catch {s define [subst $schema]} errMsg]
        #puts $errMsg
        s delete
    }
    set result
} {0 1 1 0 0 0 0 1 1 0 1 1}

}

    foreach selector {
        a
        ./../a
        /foo
        a/b
        {a | b}
        a|b
        (a|b)
        .//a
        //a
        a/@ref
        a/b/c
        a//b/c
        (.//b|a)/c
    } {
................................................................................
        set ::schema-19.2 $selector
        tdom::schema s
        lappend result [catch {s define [subst $schema]} errMsg]
        #puts $errMsg
        s delete
    }
    set result
} {0 1 1 0 0 0 1 0 1 1 0 1 1}

}