* generic/tclCompile.c: Re-implement Tcl_SubstObj() as a simple

        * generic/tclParse.c:   wrapper around TclNRSubstObj().  This has
        * tests/basic.test:     the effect of caching compiled bytecode in
        * tests/parse.test:     the value to be substituted.  Note that
        Tcl_SubstObj() now exists only for extensions.  Tcl itself no longer
        makes any use of it.  Note also that TclSubstTokens() is now reachable
        only by Tcl_EvalEx() and Tcl_ParseVar() so tests aiming to test its
        functioning needed adjustment to still have the intended effect.

2 files changed, 14 insertions, 25 deletions

diff --git a/tests/basic.test b/tests/basic.test
index 881b329..c07d805 100644
--- a/tests/basic.test
+++ b/tests/basic.test
@@ -15,7 +15,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: basic.test,v 1.45 2009/09/04 17:33:12 dgp Exp $
+# RCS: @(#) $Id: basic.test,v 1.46 2009/09/17 17:58:10 dgp Exp $
 #
 
 package require tcltest 2
@@ -631,8 +631,10 @@ test basic-46.5 {Tcl_AllowExceptions: exception return not allowed} -setup {
 "return -code return"
     (file "*BREAKtest" line 2)}
 
-test basic-47.1 {Tcl_EvalEx: check for missing close-bracket} -body {
-    set subst subst; $subst {a[set b [format cd]}
+test basic-47.1 {Tcl_EvalEx: check for missing close-bracket} -constraints {
+    testevalex
+} -body {
+    testevalex {a[set b [format cd]}
 } -returnCodes error -result {missing close-bracket}
 
 # Some lists for expansion tests to work with
diff --git a/tests/parse.test b/tests/parse.test
index 482c3b8..b83d20e 100644
--- a/tests/parse.test
+++ b/tests/parse.test
@@ -8,7 +8,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: parse.test,v 1.38 2009/09/11 20:13:27 dgp Exp $
+# RCS: @(#) $Id: parse.test,v 1.39 2009/09/17 17:58:10 dgp Exp $
 
 if {[catch {package require tcltest 2.0.2}]} {
     puts stderr "Skipping tests in [info script]. tcltest 2.0.2 required."
@@ -895,8 +895,8 @@ test parse-15.60 {CommandComplete procedure} {
     info complete \\\n
 } 0
 
-test parse-16.1 {Tcl_EvalEx, check termOffset is set correctly for non TCL_OK cases, bug 2535} {
-    set subst subst; $subst {[eval {return foo}]bar}
+test parse-16.1 {Bug 218885 (Scriptics bug 2535)} {
+    subst {[eval {return foo}]bar}
 } foobar
 
 test parse-17.1 {Correct return codes from errors during substitution} {
@@ -1038,25 +1038,12 @@ test parse-19.2 {Bug 1115904: recursion limit in Tcl_EvalEx} -constraints {
     interp delete i
 } -returnCodes error -match glob -result {too many nested*}
 
-test parse-19.3 {Bug 1115904: recursion limit in Tcl_EvalEx} -setup {
-    interp create i
-    i eval {proc {} args {}}
-    interp recursionlimit i 3
-} -body {
-    i eval {set subst subst; $subst {[]}}
-} -cleanup {
-    interp delete i
-}
-
-test parse-19.4 {Bug 1115904: recursion limit in Tcl_EvalEx} -constraints knownBug -setup {
-    interp create i
-    i eval {proc {} args {}}
-    interp recursionlimit i 2
-} -body {
-    i eval {set subst subst; $subst {[[]]}}
-} -cleanup {
-    interp delete i
-} -returnCodes error -match glob -result {too many nested*}
+test parse-19.3 {Bug 1115904: recursion limit in Tcl_EvalEx} emptyTest {
+    # Test no longer valid in Tcl 8.6
+} {}
+test parse-19.4 {Bug 1115904: recursion limit in Tcl_EvalEx} emptyTest {
+    # Test no longer valid in Tcl 8.6
+} {}
 
 cleanupTests
 }