diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-05 08:53:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-07-05 08:53:17 (GMT) |
| commit | eb05205f603455afbe3445cef6a03226078d09b0 (patch) | |
| tree | 6578b10ed36891f4a83ed2a332b1798679faf140 | |
| parent | ca96c2bbccf3088770bcf436a51cb20176f08232 (diff) | |
| parent | b49c883bbe8c5aa0620b7bc648e3172b784ef892 (diff) | |
| download | tcl-eb05205f603455afbe3445cef6a03226078d09b0.zip tcl-eb05205f603455afbe3445cef6a03226078d09b0.tar.gz tcl-eb05205f603455afbe3445cef6a03226078d09b0.tar.bz2 | |
Fixup the ensemble rewrite conversions (merge fork)
| -rw-r--r-- | generic/tclEnsemble.c | 7 | ||||
| -rw-r--r-- | generic/tclExecute.c | 2 | ||||
| -rw-r--r-- | library/tcltest/tcltest.tcl | 2 |
3 files changed, 2 insertions, 9 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 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; diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl index f1ce970..cde2660 100644 --- a/library/tcltest/tcltest.tcl +++ b/library/tcltest/tcltest.tcl @@ -614,7 +614,7 @@ namespace eval tcltest { set levelMap { l list p pass - b body + b body s skip t start e error |