diff options
| author | dgp <dgp@users.sourceforge.net> | 2009-09-11 20:13:27 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2009-09-11 20:13:27 (GMT) |
| commit | c30ce8dcf495febef9d5111ae53ac2a614e593c1 (patch) | |
| tree | 3752be5dcbdff1a044daf4602cb5e78552c4d52d /generic/tclCmdMZ.c | |
| parent | 8bfbb0cd8dbc0d85beef1db77403d7c60a39df65 (diff) | |
| download | tcl-c30ce8dcf495febef9d5111ae53ac2a614e593c1.zip tcl-c30ce8dcf495febef9d5111ae53ac2a614e593c1.tar.gz tcl-c30ce8dcf495febef9d5111ae53ac2a614e593c1.tar.bz2 | |
* generic/tclBasic.c: Completed the NR-enabling of [subst].
* generic/tclCmdMZ.c: [Bug 2314561].
* generic/tclCompCmds.c:
* generic/tclCompile.c:
* generic/tclInt.h:
* tests/coroutine.test:
* tests/parse.test:
Diffstat (limited to 'generic/tclCmdMZ.c')
| -rw-r--r-- | generic/tclCmdMZ.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c index a5a2f1b..72b46af 100644 --- a/generic/tclCmdMZ.c +++ b/generic/tclCmdMZ.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdMZ.c,v 1.192 2009/09/04 17:33:11 dgp Exp $ + * RCS: @(#) $Id: tclCmdMZ.c,v 1.193 2009/09/11 20:13:27 dgp Exp $ */ #include "tclInt.h" @@ -3419,7 +3419,16 @@ Tcl_SubstObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { - Tcl_Obj *resultPtr; + return Tcl_NRCallObjProc(interp, TclNRSubstObjCmd, dummy, objc, objv); +} + +int +TclNRSubstObjCmd( + ClientData dummy, /* Not used. */ + Tcl_Interp *interp, /* Current interpreter. */ + int objc, /* Number of arguments. */ + Tcl_Obj *const objv[]) /* Argument objects. */ +{ int flags; if (objc < 2) { @@ -3431,14 +3440,7 @@ Tcl_SubstObjCmd( if (TclSubstOptions(interp, objc-2, objv+1, &flags) != TCL_OK) { return TCL_ERROR; } - - resultPtr = Tcl_SubstObj(interp, objv[objc-1], flags); - - if (resultPtr == NULL) { - return TCL_ERROR; - } - Tcl_SetObjResult(interp, resultPtr); - return TCL_OK; + return TclNRSubstObj(interp, objv[objc-1], flags); } /* |