summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-01-08 00:34:58 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-01-08 00:34:58 (GMT)
commitae5d02d6bc12e614899a7770ab82ef0dd72b0255 (patch)
treee73337b808709b23b8cccab51ce316b0e1ad4e46 /tests
parent653d9ae8904694cb9138afb697b85daebd370205 (diff)
downloadtcl-ae5d02d6bc12e614899a7770ab82ef0dd72b0255.zip
tcl-ae5d02d6bc12e614899a7770ab82ef0dd72b0255.tar.gz
tcl-ae5d02d6bc12e614899a7770ab82ef0dd72b0255.tar.bz2
* generic/tclCompCmds.c (TclCompileReturnCmd):
* tests/compile.test: Corrects failure of bytecompiled [catch {return}] to have result TCL_RETURN (not TCL_OK) [Bug 633204]. This patch is a workaround for 8.4.X. A new opcode INST_RETURN is a better long term solution for 8.5 and later.
Diffstat (limited to 'tests')
-rw-r--r--tests/compile.test34
1 files changed, 32 insertions, 2 deletions
diff --git a/tests/compile.test b/tests/compile.test
index f3c1a08..e31da81 100644
--- a/tests/compile.test
+++ b/tests/compile.test
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: compile.test,v 1.23 2002/08/26 17:38:54 msofer Exp $
+# RCS: @(#) $Id: compile.test,v 1.24 2003/01/08 00:34:59 dgp Exp $
package require tcltest 2
namespace import -force ::tcltest::*
@@ -331,7 +331,37 @@ test compile-14.1 {testing errors in element name; segfault?} {} {
list $msg1 $msg2
} {{wrong # args: should be "error message ?errorInfo? ?errorCode?"} {can't read "abba": no such variable}}
-
+# Next 4 tests cover Tcl Bug 633204
+test compile-15.1 {proper TCL_RETURN code from [return]} {
+ proc p {} {catch return}
+ set result [p]
+ rename p {}
+ set result
+} 2
+test compile-15.2 {proper TCL_RETURN code from [return]} {
+ proc p {} {catch {return foo}}
+ set result [p]
+ rename p {}
+ set result
+} 2
+test compile-15.3 {proper TCL_RETURN code from [return]} {
+ proc p {} {catch {return $::tcl_library}}
+ set result [p]
+ rename p {}
+ set result
+} 2
+test compile-15.4 {proper TCL_RETURN code from [return]} {
+ proc p {} {catch {return [info library]}}
+ set result [p]
+ rename p {}
+ set result
+} 2
+test compile-15.5 {proper TCL_RETURN code from [return]} {
+ proc p {} {catch {set a 1}; return}
+ set result [p]
+ rename p {}
+ set result
+} ""
# cleanup