diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-05 08:55:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-05 08:55:04 (GMT) |
| commit | d65776f03fd29880dfcffc30823a244e68e0765a (patch) | |
| tree | d56bdaa737af202bbae33fbad26498e2f6c7de23 | |
| parent | 2ee0bbf7fb08c3e5a87f7fa51a83e97ca90fc620 (diff) | |
| parent | 7b6eaf23e921dcfa7564ca1ba7fbc7092a9778a7 (diff) | |
| download | tcl-d65776f03fd29880dfcffc30823a244e68e0765a.zip tcl-d65776f03fd29880dfcffc30823a244e68e0765a.tar.gz tcl-d65776f03fd29880dfcffc30823a244e68e0765a.tar.bz2 | |
Fixup the ensemble rewrite conversions
| -rw-r--r-- | generic/tclEnsemble.c | 7 | ||||
| -rw-r--r-- | generic/tclExecute.c | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c index 6489dea..a9698be 100644 --- a/generic/tclEnsemble.c +++ b/generic/tclEnsemble.c @@ -1852,12 +1852,7 @@ NsEnsembleImplementationCmdNR( Tcl_ListObjLength(NULL, prefixObj, &prefixObjc); - if (0 && objc == 2) { - /* - * TODO: This branch is disabled because it botches or exposes - * something wrong with nested ensemble usage messages. See - * tests oo-16.1 and oo-17.1 - */ + if (objc == 2) { copyPtr = prefixObj; Tcl_IncrRefCount(copyPtr); TclNRAddCallback(interp, FreeObj, copyPtr, NULL, NULL, NULL); diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 0a6e60e..df0618c 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -2074,8 +2074,6 @@ TclNRExecuteByteCode( * Push the callback for bytecode execution */ - TclResetRewriteEnsemble(interp, 1); - TclNRAddCallback(interp, TEBCresume, TD, /* pc */ NULL, /* cleanup */ INT2PTR(0), NULL); return TCL_OK; |