diff options
author | dgp <dgp@users.sourceforge.net> | 2017-04-12 19:19:05 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2017-04-12 19:19:05 (GMT) |
commit | b2974f1f0e669628c3610c9d37cdee084e9c9810 (patch) | |
tree | de66955a09ece2ded5735f775193421096e1163d /generic | |
parent | f325616ca0b76bfb644bb17a91bc9ac2146b8644 (diff) | |
parent | bc97ae8a02bb8363f85b25501b9aa125c5b344cd (diff) | |
download | tcl-b2974f1f0e669628c3610c9d37cdee084e9c9810.zip tcl-b2974f1f0e669628c3610c9d37cdee084e9c9810.tar.gz tcl-b2974f1f0e669628c3610c9d37cdee084e9c9810.tar.bz2 |
merge 8.6
Diffstat (limited to 'generic')
-rw-r--r-- | generic/tclBasic.c | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 4bddbce..f604ac1 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -8748,6 +8748,35 @@ TclNRCoroutineActivateCallback( /* *---------------------------------------------------------------------- * + * TclNREvalList -- + * + * Callback to invoke command as list, used in order to delayed + * processing of canonical list command in sane environment. + * + *---------------------------------------------------------------------- + */ + +static int +TclNREvalList( + ClientData data[], + Tcl_Interp *interp, + int result) +{ + int objc; + Tcl_Obj **objv; + Tcl_Obj *listPtr = data[0]; + + Tcl_IncrRefCount(listPtr); + + TclMarkTailcall(interp); + TclNRAddCallback(interp, TclNRReleaseValues, listPtr, NULL, NULL,NULL); + TclListObjGetElements(NULL, listPtr, &objc, &objv); + return TclNREvalObjv(interp, objc, objv, 0, NULL); +} + +/* + *---------------------------------------------------------------------- + * * NRCoroInjectObjCmd -- * * Implementation of [::tcl::unsupported::inject] command. @@ -8799,7 +8828,8 @@ NRCoroInjectObjCmd( */ iPtr->execEnvPtr = corPtr->eePtr; - TclNREvalObjEx(interp, Tcl_NewListObj(objc-2, objv+2), 0, NULL, INT_MIN); + TclNRAddCallback(interp, TclNREvalList, Tcl_NewListObj(objc-2, objv+2), + NULL, NULL, NULL); iPtr->execEnvPtr = savedEEPtr; return TCL_OK; |