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

Overview
Comment:Removed slipped throu debuging instrumentalization.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | schema
Files: files | file ages | folders
SHA3-256: 22b17ef648f1daac5ec76767d9ab0c84c51cf8c89465f720fcc0d9350f0a22d6
User & Date: rolf 2019-11-18 22:42:11
Context
2019-11-21
00:57
Fixed -DTDOM_NO_SCHEMA=1 build. check-in: 95b30715cd user: rolf tags: schema
2019-11-18
22:42
Removed slipped throu debuging instrumentalization. check-in: 22b17ef648 user: rolf tags: schema
22:37
The attribute und nsattribute commands are only supported toplevel in the definition scripts of the defelement method and the element command. check-in: b3b2ce77f0 user: rolf tags: schema
Changes

Changes to generic/schema.c.

25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
....
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603

#include <tdom.h>
#include <tcldom.h>
#include <domxpath.h>
#include <schema.h>

/* #define DEBUG */
#define DDEBUG
/*----------------------------------------------------------------------------
|   Debug Macros
|
\---------------------------------------------------------------------------*/
#ifdef DEBUG
# define DBG(x) x
#else
................................................................................
    Tcl_Obj *nsObj, *nameObj;
    Tcl_HashEntry *h;
    SchemaCP *type;

    CHECK_SI
    CHECK_TOPLEVEL

        serializeCP (sdata->cp);
    if (sdata->cp->type != SCHEMA_CTYPE_NAME) {
        SetResult ("The commands attribute and nsattribute are only allowed toplevel in element definition scripts");
        return TCL_ERROR;
    }
    if (clientData) {
        checkNrArgs (3,6,"Expected:"
                     "  name namespace"







|







 







<







25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
....
4589
4590
4591
4592
4593
4594
4595

4596
4597
4598
4599
4600
4601
4602

#include <tdom.h>
#include <tcldom.h>
#include <domxpath.h>
#include <schema.h>

/* #define DEBUG */
/* #define DDEBUG */
/*----------------------------------------------------------------------------
|   Debug Macros
|
\---------------------------------------------------------------------------*/
#ifdef DEBUG
# define DBG(x) x
#else
................................................................................
    Tcl_Obj *nsObj, *nameObj;
    Tcl_HashEntry *h;
    SchemaCP *type;

    CHECK_SI
    CHECK_TOPLEVEL


    if (sdata->cp->type != SCHEMA_CTYPE_NAME) {
        SetResult ("The commands attribute and nsattribute are only allowed toplevel in element definition scripts");
        return TCL_ERROR;
    }
    if (clientData) {
        checkNrArgs (3,6,"Expected:"
                     "  name namespace"

Changes to tests/schema.test.

2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
        {defpattern some {attribute foo}}
        {defelement doc {element {attribute foo}}}
    }
    set result [list]
    foreach def $defs {
        puts $def
        tdom::schema create s
        lappend result [catch {s define $def} errMsg]
        puts $errMsg
        s delete
    }
    set result
} {0 1 1 0}

test schema-12.1 {domvalidate} {
    tdom::schema s 







|
<







2966
2967
2968
2969
2970
2971
2972
2973

2974
2975
2976
2977
2978
2979
2980
        {defpattern some {attribute foo}}
        {defelement doc {element {attribute foo}}}
    }
    set result [list]
    foreach def $defs {
        puts $def
        tdom::schema create s
        lappend result [catch {s define $def}]

        s delete
    }
    set result
} {0 1 1 0}

test schema-12.1 {domvalidate} {
    tdom::schema s