summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclBasic.c6
-rw-r--r--tests/basic.test4
-rw-r--r--tests/interp.test8
4 files changed, 14 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index f8c62ef..04ad752 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-05 Donal K. Fellows <fellowsd@cs.man.ac.uk>
+
+ * generic/tclBasic.c (Tcl_HideCommand): Fixed error message for
+ grammar and spelling.
+
2003-04-28 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* generic/tclDictObj.c (DictIncrCmd): Updated to reflect the
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 021b937..bd8efdc 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclBasic.c,v 1.79 2003/04/25 21:23:18 dgp Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.80 2003/05/05 16:48:54 dkf Exp $
*/
#include "tclInt.h"
@@ -1167,8 +1167,8 @@ Tcl_HideCommand(interp, cmdName, hiddenCmdToken)
if (strstr(hiddenCmdToken, "::") != NULL) {
Tcl_AppendStringsToObj(Tcl_GetObjResult(interp),
- "cannot use namespace qualifiers as hidden command",
- "token (rename)", (char *) NULL);
+ "cannot use namespace qualifiers in hidden command",
+ " token (rename)", (char *) NULL);
return TCL_ERROR;
}
diff --git a/tests/basic.test b/tests/basic.test
index c25ef2b..0257ded 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.26 2003/03/04 23:46:10 dgp Exp $
+# RCS: @(#) $Id: basic.test,v 1.27 2003/05/05 16:48:54 dkf Exp $
#
package require tcltest 2
@@ -132,7 +132,7 @@ test basic-12.1 {Tcl_HideCommand, names of hidden cmds can't have namespace qual
list [catch {test_interp hide test_ns_basic::p x} msg] $msg \
[catch {test_interp hide x test_ns_basic::p} msg1] $msg1 \
[interp delete test_interp]
-} {1 {can only hide global namespace commands (use rename then hide)} 1 {cannot use namespace qualifiers as hidden commandtoken (rename)} {}}
+} {1 {can only hide global namespace commands (use rename then hide)} 1 {cannot use namespace qualifiers in hidden command token (rename)} {}}
test basic-12.2 {Tcl_HideCommand, a hidden cmd remembers its containing namespace} {
catch {namespace delete test_ns_basic}
diff --git a/tests/interp.test b/tests/interp.test
index 43599b8..5ce02d6 100644
--- a/tests/interp.test
+++ b/tests/interp.test
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: interp.test,v 1.20 2003/03/12 17:52:36 dgp Exp $
+# RCS: @(#) $Id: interp.test,v 1.21 2003/05/05 16:48:54 dkf Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2.1
@@ -1498,7 +1498,7 @@ test interp-20.45 {interp hide vs namespaces} {
set l [list [catch {interp hide a foo::x} msg] $msg]
interp delete a
set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
+} {1 {cannot use namespace qualifiers in hidden command token (rename)}}
test interp-20.46 {interp hide vs namespaces} {
catch {interp delete a}
interp create a
@@ -1519,7 +1519,7 @@ test interp-20.47 {interp hide vs namespaces} {
set l [list [catch {interp hide a x foo::x} msg] $msg]
interp delete a
set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
+} {1 {cannot use namespace qualifiers in hidden command token (rename)}}
test interp-20.48 {interp hide vs namespaces} {
catch {interp delete a}
interp create a
@@ -1530,7 +1530,7 @@ test interp-20.48 {interp hide vs namespaces} {
set l [list [catch {interp hide a foo::x bar::x} msg] $msg]
interp delete a
set l
-} {1 {cannot use namespace qualifiers as hidden commandtoken (rename)}}
+} {1 {cannot use namespace qualifiers in hidden command token (rename)}}
test interp-21.1 {interp hidden} {
interp hidden {}