summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2016-07-04 20:39:43 (GMT)
committerdgp <dgp@users.sourceforge.net>2016-07-04 20:39:43 (GMT)
commitb49c883bbe8c5aa0620b7bc648e3172b784ef892 (patch)
treeb0b3e1af8b6c562a08246584b56f47533ebbf7c7
parent2f4c482ac0cec564faea01f71d44f481d96f9e9e (diff)
downloadtcl-b49c883bbe8c5aa0620b7bc648e3172b784ef892.zip
tcl-b49c883bbe8c5aa0620b7bc648e3172b784ef892.tar.gz
tcl-b49c883bbe8c5aa0620b7bc648e3172b784ef892.tar.bz2
Fixup the ensemble rewrite conversions.core_8_6_branch_fork
-rw-r--r--generic/tclEnsemble.c7
-rw-r--r--generic/tclExecute.c2
2 files changed, 1 insertions, 8 deletions
diff --git a/generic/tclEnsemble.c b/generic/tclEnsemble.c
index 17ab35b..11ec3fc 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 355b667..1389382 100644
--- a/generic/tclExecute.c
+++ b/generic/tclExecute.c
@@ -2081,8 +2081,6 @@ TclNRExecuteByteCode(
* Push the callback for bytecode execution
*/
- TclResetRewriteEnsemble(interp, 1);
-
TclNRAddCallback(interp, TEBCresume, TD, /* pc */ NULL,
/* cleanup */ INT2PTR(0), NULL);
return TCL_OK;