Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch notANodeMsg Excluding Merge-Ins
This is equivalent to a diff from c54834be20 to cde666b194
2018-06-04
| ||
18:08 | Refer the node cmd/token that isn't a domNode in error msg. check-in: d404fd67a8 user: rolf tags: trunk | |
13:03 | Refer the node cmd/token that isn't a domNode in error msg. Closed-Leaf check-in: cde666b194 user: rolf tags: notANodeMsg | |
2018-05-28
| ||
03:41 | Reorder RANLIB clause to avoid "permission denied" error. check-in: c54834be20 user: yorick tags: trunk | |
2018-05-27
| ||
00:22 | Removed unused variable. check-in: 0e29ef329c user: rolf tags: trunk | |
Changes to generic/tcldom.c.
︙ | ︙ | |||
78 79 80 81 82 83 84 | #define MAX_REWRITE_ARGS 50 #define MAX_XSLT_APPLY_DEPTH 3000 #define SetResult(str) Tcl_ResetResult(interp); \ Tcl_SetStringObj(Tcl_GetObjResult(interp), (str), -1) | > > > | | 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 | #define MAX_REWRITE_ARGS 50 #define MAX_XSLT_APPLY_DEPTH 3000 #define SetResult(str) Tcl_ResetResult(interp); \ Tcl_SetStringObj(Tcl_GetObjResult(interp), (str), -1) #define SetResult3(str1,str2,str3) Tcl_ResetResult(interp); \ Tcl_AppendResult(interp, (str1), (str2), (str3), NULL) #define SetIntResult(i) Tcl_ResetResult(interp); \ Tcl_SetIntObj(Tcl_GetObjResult(interp), (i)) #define SetDoubleResult(d) Tcl_ResetResult(interp); \ Tcl_SetDoubleObj(Tcl_GetObjResult(interp), (d)) #define SetBooleanResult(i) Tcl_ResetResult(interp); \ Tcl_SetBooleanObj(Tcl_GetObjResult(interp), (i)) |
︙ | ︙ | |||
611 612 613 614 615 616 617 | if (objPtr->typePtr == &tdomNodeType) { return TCL_OK; } nodeName = Tcl_GetString(objPtr); if (strncmp(nodeName, "domNode", 7)) { if (interp) { | | | > | | 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 | if (objPtr->typePtr == &tdomNodeType) { return TCL_OK; } nodeName = Tcl_GetString(objPtr); if (strncmp(nodeName, "domNode", 7)) { if (interp) { SetResult3("Parameter \"", nodeName, "\" is not a domNode."); return TCL_ERROR; } } if (sscanf(&nodeName[7], "%p%1c", &node, &eolcheck) != 1) { if (!Tcl_GetCommandInfo(interp, nodeName, &cmdInfo)) { if (interp) { SetResult3("Parameter \"", nodeName, "\" is not a domNode."); return TCL_ERROR; } } if ( (cmdInfo.isNativeObjectProc == 0) || (cmdInfo.objProc != (Tcl_ObjCmdProc*)tcldom_NodeObjCmd)) { if (interp) { SetResult3("Parameter \"", nodeName, "\" is not a domNode" " object command"); return TCL_ERROR; } } node = (domNode*)cmdInfo.objClientData; } if (objPtr->typePtr && objPtr->typePtr->freeIntRepProc) { objPtr->typePtr->freeIntRepProc(objPtr); |
︙ | ︙ | |||
1084 1085 1086 1087 1088 1089 1090 | return (domNode*)nodeObj->internalRep.otherValuePtr; } return NULL; } nodeName = Tcl_GetString(nodeObj); if (strncmp(nodeName, "domNode", 7)) { | | | > | | 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 | return (domNode*)nodeObj->internalRep.otherValuePtr; } return NULL; } nodeName = Tcl_GetString(nodeObj); if (strncmp(nodeName, "domNode", 7)) { SetResult3("Parameter \"", nodeName, "\" is not a domNode."); return NULL; } if (sscanf(&nodeName[7], "%p%1c", &node, &eolcheck) != 1) { if (!Tcl_GetCommandInfo(interp, nodeName, &cmdInfo)) { SetResult3("Parameter \"", nodeName, "\" is not a domNode."); return NULL; } if ( (cmdInfo.isNativeObjectProc == 0) || (cmdInfo.objProc != (Tcl_ObjCmdProc*)tcldom_NodeObjCmd)) { SetResult3("Parameter \"", nodeName, "\" is not a domNode" " object command."); return NULL; } node = (domNode*)cmdInfo.objClientData; } return node; } |
︙ | ︙ |
Changes to tests/dom.test.
︙ | ︙ | |||
1692 1693 1694 1695 1696 1697 1698 | set elem [domDoc $doc createElement one] domNode $elem delete set result [catch {domNode $elem asList} errMsg] lappend result $errMsg domDoc $doc delete dom setObjectCommands automatic set result | | | 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 | set elem [domDoc $doc createElement one] domNode $elem delete set result [catch {domNode $elem asList} errMsg] lappend result $errMsg domDoc $doc delete dom setObjectCommands automatic set result } {1 {Parameter "" is not a domNode.}} catch {namespace delete nodeCmds} namespace eval nodeCmds { dom createNodeCmd elementNode e1 dom createNodeCmd elementNode e2 dom createNodeCmd commentNode c |
︙ | ︙ |
Changes to tests/domNode.test.
︙ | ︙ | |||
2414 2415 2416 2417 2418 2419 2420 | set firstChild [$root firstChild] catch {$root start $firstChild foo} } {1} test domNode-30.3 {precedes} { set result [catch {$root precedes notaNode} errMsg] lappend result $errMsg | | | 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 | set firstChild [$root firstChild] catch {$root start $firstChild foo} } {1} test domNode-30.3 {precedes} { set result [catch {$root precedes notaNode} errMsg] lappend result $errMsg } {1 {Parameter "notaNode" is not a domNode.}} test domNode-30.4 {precedes} { set firstChild [$root firstChild] $root precedes $firstChild } {1} test domNode-30.5 {precedes} { |
︙ | ︙ |