diff options
| author | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-21 16:25:58 (GMT) |
|---|---|---|
| committer | Miguel Sofer <miguel.sofer@gmail.com> | 2008-07-21 16:25:58 (GMT) |
| commit | 1d5e719008a7c51b66cc13a0a30991af762353c1 (patch) | |
| tree | 8fd30c46b1bdb91d7e870818b760478eb06a9f16 /generic/tclNamesp.c | |
| parent | 884b6dff3c37ee13afd4737b75fd7c23ed011c5d (diff) | |
| download | tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.zip tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.tar.gz tcl-1d5e719008a7c51b66cc13a0a30991af762353c1.tar.bz2 | |
* generic/tcl.decls: Changed the implementation of
* generic/tclBasic.c: [namespace import]; removed
* generic/tclDecls.h: Tcl_NRObjProc, replaced with
* generic/tclExecute.c: Tcl_NRCmdSwap (proposed public
* generic/tclInt.h: NRE API). This should fix
* generic/tclNRE.h: [Bug 582506].
* generic/tclNamesp.c:
* generic/tclStubInit.c:
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index f657e75..cf7e250 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -23,7 +23,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclNamesp.c,v 1.169 2008/07/19 22:50:41 nijtmans Exp $ + * RCS: @(#) $Id: tclNamesp.c,v 1.170 2008/07/21 16:26:08 msofer Exp $ */ #include "tclInt.h" @@ -1894,14 +1894,10 @@ InvokeImportedNRCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { - register ImportedCmdData *dataPtr = clientData; - register Command *realCmdPtr = dataPtr->realCmdPtr; + ImportedCmdData *dataPtr = clientData; + Command *realCmdPtr = dataPtr->realCmdPtr; - if (!realCmdPtr->nreProc) { - return realCmdPtr->objProc(realCmdPtr->objClientData, interp, - objc, objv); - } - return realCmdPtr->nreProc(realCmdPtr->objClientData, interp, objc, objv); + return Tcl_NRCmdSwap(interp, (Tcl_Command) realCmdPtr, objc, objv); } static int @@ -1912,10 +1908,8 @@ InvokeImportedCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* The argument objects. */ { - register ImportedCmdData *dataPtr = clientData; - register Command *realCmdPtr = dataPtr->realCmdPtr; - - return realCmdPtr->objProc(realCmdPtr->objClientData, interp, objc, objv); + return Tcl_NRCallObjProc(interp, InvokeImportedNRCmd, clientData, + objc, objv); } /* |