From ad35d9b5b7a3de682d371c0bb686815f1c5e849e Mon Sep 17 00:00:00 2001 From: nijtmans Date: Sun, 13 Jul 2008 23:15:21 +0000 Subject: more consistent wrong # arg messages: change all messages containing ?options? to the form ?-option value ...? --- doc/http.n | 6 +++--- doc/lindex.n | 4 ++-- doc/lset.n | 4 ++-- doc/tcltest.n | 10 +++++----- generic/tclClock.c | 4 ++-- generic/tclCmdIL.c | 10 +++++----- generic/tclFCmd.c | 8 ++++---- generic/tclIOCmd.c | 4 ++-- generic/tclInterp.c | 10 +++++----- generic/tclOOInfo.c | 6 +++--- generic/tclPkg.c | 4 ++-- tests/chan.test | 4 ++-- tests/cmdIL.test | 4 ++-- tests/fCmd.test | 6 +++--- tests/indexObj.test | 6 +++--- tests/interp.test | 6 +++--- tests/ioCmd.test | 6 +++--- tests/lindex.test | 6 +++--- tests/lsearch.test | 6 +++--- tests/lset.test | 2 +- tests/lsetComp.test | 2 +- tests/pkg.test | 20 ++++++++++---------- tests/var.test | 6 +++--- 23 files changed, 72 insertions(+), 72 deletions(-) diff --git a/doc/http.n b/doc/http.n index d0b3c52..6cfb7cb 100644 --- a/doc/http.n +++ b/doc/http.n @@ -6,7 +6,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: http.n,v 1.36 2008/03/12 10:01:02 hobbs Exp $ +'\" RCS: @(#) $Id: http.n,v 1.37 2008/07/13 23:15:23 nijtmans Exp $ '\" .so man.macros .TH "http" n 2.7 http "Tcl Bundled Packages" @@ -18,9 +18,9 @@ http \- Client-side implementation of the HTTP/1.1 protocol \fBpackage require http ?2.7?\fR .\" See Also -useragent option documentation in body! .sp -\fB::http::config \fI?options?\fR +\fB::http::config ?\fI-option value\fR ...? .sp -\fB::http::geturl \fIurl ?options?\fR +\fB::http::geturl \fIurl\fR ?\fI-option value\fR ...? .sp \fB::http::formatQuery\fR \fIkey value\fR ?\fIkey value\fR ...? .sp diff --git a/doc/lindex.n b/doc/lindex.n index 39682d9..3214cc7 100644 --- a/doc/lindex.n +++ b/doc/lindex.n @@ -6,7 +6,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: lindex.n,v 1.19 2008/07/06 09:42:58 dkf Exp $ +'\" RCS: @(#) $Id: lindex.n,v 1.20 2008/07/13 23:15:23 nijtmans Exp $ '\" .so man.macros .TH lindex n 8.4 Tcl "Tcl Built-In Commands" @@ -15,7 +15,7 @@ .SH NAME lindex \- Retrieve an element from a list .SH SYNOPSIS -\fBlindex \fIlist ?index...?\fR +\fBlindex \fIlist ?index ...?\fR .BE .SH DESCRIPTION .PP diff --git a/doc/lset.n b/doc/lset.n index b13f2b1..0e95353 100755 --- a/doc/lset.n +++ b/doc/lset.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: lset.n,v 1.16 2008/06/29 22:28:24 dkf Exp $ +'\" RCS: @(#) $Id: lset.n,v 1.17 2008/07/13 23:15:23 nijtmans Exp $ '\" .so man.macros .TH lset n 8.4 Tcl "Tcl Built-In Commands" @@ -13,7 +13,7 @@ .SH NAME lset \- Change an element in a list .SH SYNOPSIS -\fBlset \fIvarName ?index...? newValue\fR +\fBlset \fIvarName ?index ...? newValue\fR .BE .SH DESCRIPTION .PP diff --git a/doc/tcltest.n b/doc/tcltest.n index 65245bf..88320cc 100644 --- a/doc/tcltest.n +++ b/doc/tcltest.n @@ -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: tcltest.n,v 1.55 2007/12/13 15:22:33 dgp Exp $ +'\" RCS: @(#) $Id: tcltest.n,v 1.56 2008/07/13 23:15:23 nijtmans Exp $ '\" .so man.macros .TH "tcltest" n 2.3 tcltest "Tcl Bundled Packages" @@ -20,7 +20,7 @@ tcltest \- Test harness support code and utilities .nf \fBpackage require tcltest ?2.3?\fR .sp -\fBtcltest::test \fIname description ?option value ...?\fR +\fBtcltest::test \fIname description ?-option value ...?\fR \fBtcltest::test \fIname description ?constraints? body result\fR .sp \fBtcltest::loadTestedCommands\fR @@ -34,7 +34,7 @@ tcltest \- Test harness support code and utilities .sp \fBtcltest::configure\fR \fBtcltest::configure \fIoption\fR -\fBtcltest::configure \fIoption value ?option value ...?\fR +\fBtcltest::configure \fIoption value ?-option value ...?\fR \fBtcltest::customMatch \fImode command\fR \fBtcltest::testConstraint \fIconstraint ?value?\fR \fBtcltest::outputChannel \fI?channelID?\fR @@ -92,7 +92,7 @@ of how to use the commands of \fBtcltest\fR to produce test suites for your Tcl-enabled code. .SH COMMANDS .TP -\fBtest\fR \fIname description ?option value ...?\fR +\fBtest\fR \fIname description ?-option value ...?\fR Defines and possibly runs a test with the name \fIname\fR and description \fIdescription\fR. The name and description of a test are used in messages reported by \fBtest\fR during the @@ -211,7 +211,7 @@ their valid values, and their effect on \fBtcltest\fR operations. Returns the current value of the supported configurable option \fIoption\fR. Raises an error if \fIoption\fR is not a supported configurable option. .TP -\fBconfigure \fIoption value ?option value ...?\fR +\fBconfigure \fIoption value ?-option value ...?\fR Sets the value of each configurable option \fIoption\fR to the corresponding value \fIvalue\fR, in order. Raises an error if an \fIoption\fR is not a supported configurable option, or if diff --git a/generic/tclClock.c b/generic/tclClock.c index abf70ef..68db1a4 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclClock.c,v 1.68 2008/06/17 17:22:48 andreas_kupries Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.69 2008/07/13 23:15:22 nijtmans Exp $ */ #include "tclInt.h" @@ -1707,7 +1707,7 @@ ClockClicksObjCmd( } break; default: - Tcl_WrongNumArgs(interp, 1, objv, "?option?"); + Tcl_WrongNumArgs(interp, 1, objv, "?-option?"); return TCL_ERROR; } diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 4eef275..b7ea47d 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -16,7 +16,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdIL.c,v 1.143 2008/07/07 21:40:18 andreas_kupries Exp $ + * RCS: @(#) $Id: tclCmdIL.c,v 1.144 2008/07/13 23:15:22 nijtmans Exp $ */ #include "tclInt.h" @@ -2114,7 +2114,7 @@ Tcl_LindexObjCmd( Tcl_Obj *elemPtr; /* Pointer to the element being extracted. */ if (objc < 2) { - Tcl_WrongNumArgs(interp, 1, objv, "list ?index...?"); + Tcl_WrongNumArgs(interp, 1, objv, "list ?index ...?"); return TCL_ERROR; } @@ -2764,7 +2764,7 @@ Tcl_LsearchObjCmd( sortInfo.indexc = 0; if (objc < 3) { - Tcl_WrongNumArgs(interp, 1, objv, "?options? list pattern"); + Tcl_WrongNumArgs(interp, 1, objv, "?-option value ...? list pattern"); return TCL_ERROR; } @@ -3386,7 +3386,7 @@ Tcl_LsetObjCmd( */ if (objc < 3) { - Tcl_WrongNumArgs(interp, 1, objv, "listVar index ?index...? value"); + Tcl_WrongNumArgs(interp, 1, objv, "listVar index ?index ...? value"); return TCL_ERROR; } @@ -3486,7 +3486,7 @@ Tcl_LsortObjCmd( SortElement *subList[NUM_LISTS+1]; if (objc < 2) { - Tcl_WrongNumArgs(interp, 1, objv, "?options? list"); + Tcl_WrongNumArgs(interp, 1, objv, "?-option value ...? list"); return TCL_ERROR; } diff --git a/generic/tclFCmd.c b/generic/tclFCmd.c index c811f1a..01eea62 100644 --- a/generic/tclFCmd.c +++ b/generic/tclFCmd.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclFCmd.c,v 1.44 2008/04/27 22:21:30 dkf Exp $ + * RCS: @(#) $Id: tclFCmd.c,v 1.45 2008/07/13 23:15:23 nijtmans Exp $ */ #include "tclInt.h" @@ -121,7 +121,7 @@ FileCopyRename( if ((objc - i) < 2) { Tcl_AppendResult(interp, "wrong # args: should be \"", TclGetString(objv[0]), " ", TclGetString(objv[1]), - " ?options? source ?source ...? target\"", NULL); + " ?-option value ...? source ?source ...? target\"", NULL); return TCL_ERROR; } @@ -354,7 +354,7 @@ TclFileDeleteCmd( if ((objc - i) < 1) { Tcl_AppendResult(interp, "wrong # args: should be \"", TclGetString(objv[0]), " ", TclGetString(objv[1]), - " ?options? file ?file ...?\"", NULL); + " ?-option value ...? file ?file ...?\"", NULL); return TCL_ERROR; } @@ -955,7 +955,7 @@ TclFileAttrsCmd( if (objc < 3) { Tcl_WrongNumArgs(interp, 2, objv, - "name ?option? ?value? ?option value ...?"); + "name ?-option value ...?"); return TCL_ERROR; } diff --git a/generic/tclIOCmd.c b/generic/tclIOCmd.c index 131b905..6549e98 100644 --- a/generic/tclIOCmd.c +++ b/generic/tclIOCmd.c @@ -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: tclIOCmd.c,v 1.54 2008/06/06 19:46:36 andreas_kupries Exp $ + * RCS: @(#) $Id: tclIOCmd.c,v 1.55 2008/07/13 23:15:22 nijtmans Exp $ */ #include "tclInt.h" @@ -718,7 +718,7 @@ Tcl_FconfigureObjCmd( if ((objc < 2) || (((objc % 2) == 1) && (objc != 3))) { Tcl_WrongNumArgs(interp, 1, objv, - "channelId ?optionName? ?value? ?optionName value?..."); + "channelId ?-option value ...?"); return TCL_ERROR; } diff --git a/generic/tclInterp.c b/generic/tclInterp.c index c4f8515..f2975d0 100644 --- a/generic/tclInterp.c +++ b/generic/tclInterp.c @@ -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: tclInterp.c,v 1.87 2008/07/13 09:03:35 msofer Exp $ + * RCS: @(#) $Id: tclInterp.c,v 1.88 2008/07/13 23:15:23 nijtmans Exp $ */ #include "tclInt.h" @@ -928,7 +928,7 @@ Tcl_InterpObjCmd( int limitType; if (objc < 4) { - Tcl_WrongNumArgs(interp, 2, objv, "path limitType ?options?"); + Tcl_WrongNumArgs(interp, 2, objv, "path limitType ?-option value ...?"); return TCL_ERROR; } slaveInterp = GetInterp(interp, objv[2]); @@ -2502,7 +2502,7 @@ SlaveObjCmd( int limitType; if (objc < 3) { - Tcl_WrongNumArgs(interp, 2, objv, "limitType ?options?"); + Tcl_WrongNumArgs(interp, 2, objv, "limitType ?-option value ...?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[2], limitTypes, "limit type", 0, @@ -4230,7 +4230,7 @@ SlaveCommandLimitCmd( return TCL_OK; } else if ((objc-consumedObjc) & 1 /* isOdd(objc-consumedObjc) */) { Tcl_WrongNumArgs(interp, consumedObjc, objv, - "?-option? ?value? ?-option value ...?"); + "?-option value ...?"); return TCL_ERROR; } else { int i, scriptLen = 0, limitLen = 0; @@ -4418,7 +4418,7 @@ SlaveTimeLimitCmd( return TCL_OK; } else if ((objc-consumedObjc) & 1 /* isOdd(objc-consumedObjc) */) { Tcl_WrongNumArgs(interp, consumedObjc, objv, - "?-option? ?value? ?-option value ...?"); + "?-option value ...?"); return TCL_ERROR; } else { int i, scriptLen = 0, milliLen = 0, secLen = 0; diff --git a/generic/tclOOInfo.c b/generic/tclOOInfo.c index bded40c..ca5830b 100644 --- a/generic/tclOOInfo.c +++ b/generic/tclOOInfo.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclOOInfo.c,v 1.4 2008/05/31 11:42:18 dkf Exp $ + * RCS: @(#) $Id: tclOOInfo.c,v 1.5 2008/07/13 23:15:22 nijtmans Exp $ */ #ifdef HAVE_CONFIG_H @@ -523,7 +523,7 @@ InfoObjectMethodsCmd( }; if (objc < 2) { - Tcl_WrongNumArgs(interp, 1, objv, "objName ?options...?"); + Tcl_WrongNumArgs(interp, 1, objv, "objName ?-option value ...?"); return TCL_ERROR; } oPtr = (Object *) Tcl_GetObjectFromObj(interp, objv[1]); @@ -1060,7 +1060,7 @@ InfoClassMethodsCmd( }; if (objc < 2) { - Tcl_WrongNumArgs(interp, 1, objv, "className ?options...?"); + Tcl_WrongNumArgs(interp, 1, objv, "className ?-option value ...?"); return TCL_ERROR; } oPtr = (Object *) Tcl_GetObjectFromObj(interp, objv[1]); diff --git a/generic/tclPkg.c b/generic/tclPkg.c index 24f3e62..8756587 100644 --- a/generic/tclPkg.c +++ b/generic/tclPkg.c @@ -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: tclPkg.c,v 1.35 2008/04/01 19:26:36 dgp Exp $ + * RCS: @(#) $Id: tclPkg.c,v 1.36 2008/07/13 23:15:22 nijtmans Exp $ * * TIP #268. * Heavily rewritten to handle the extend version numbers, and extended @@ -949,7 +949,7 @@ Tcl_PackageObjCmd( if (objc < 3) { requireSyntax: Tcl_WrongNumArgs(interp, 2, objv, - "?-exact? package ?requirement...?"); + "?-exact? package ?requirement ...?"); return TCL_ERROR; } diff --git a/tests/chan.test b/tests/chan.test index 72eccbb..ea2529c 100644 --- a/tests/chan.test +++ b/tests/chan.test @@ -7,7 +7,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: chan.test,v 1.12 2008/06/06 19:46:38 andreas_kupries Exp $ +# RCS: @(#) $Id: chan.test,v 1.13 2008/07/13 23:15:22 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -36,7 +36,7 @@ test chan-3.1 {chan command: close subcommand} -body { test chan-4.1 {chan command: configure subcommand} -body { chan configure -} -returnCodes error -result "wrong # args: should be \"chan configure channelId ?optionName? ?value? ?optionName value?...\"" +} -returnCodes error -result "wrong # args: should be \"chan configure channelId ?-option value ...?\"" test chan-4.2 {chan command: [Bug 800753]} -body { chan configure stdout -eofchar \u0100 } -returnCodes error -match glob -result {bad value*} diff --git a/tests/cmdIL.test b/tests/cmdIL.test index 1f2cf73..cc1546e 100644 --- a/tests/cmdIL.test +++ b/tests/cmdIL.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: cmdIL.test,v 1.38 2008/02/13 19:41:20 dgp Exp $ +# RCS: @(#) $Id: cmdIL.test,v 1.39 2008/07/13 23:15:21 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -20,7 +20,7 @@ testConstraint memory [llength [info commands memory]] test cmdIL-1.1 {Tcl_LsortObjCmd procedure} { list [catch {lsort} msg] $msg -} {1 {wrong # args: should be "lsort ?options? list"}} +} {1 {wrong # args: should be "lsort ?-option value ...? list"}} test cmdIL-1.2 {Tcl_LsortObjCmd procedure} { list [catch {lsort -foo {1 3 2 5}} msg] $msg } {1 {bad option "-foo": must be -ascii, -command, -decreasing, -dictionary, -increasing, -index, -indices, -integer, -nocase, -real, or -unique}} diff --git a/tests/fCmd.test b/tests/fCmd.test index 3bf6487..0216a10 100644 --- a/tests/fCmd.test +++ b/tests/fCmd.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: fCmd.test,v 1.61 2008/04/10 00:21:02 dkf Exp $ +# RCS: @(#) $Id: fCmd.test,v 1.62 2008/07/13 23:15:22 nijtmans Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -165,7 +165,7 @@ test fCmd-3.1 {FileCopyRename: FileForceOption fails} -constraints {notRoot} -bo } -returnCodes error -result {bad option "-xyz": should be -force or --} test fCmd-3.2 {FileCopyRename: not enough args} -constraints {notRoot} -body { file rename xyz -} -returnCodes error -result {wrong # args: should be "file rename ?options? source ?source ...? target"} +} -returnCodes error -result {wrong # args: should be "file rename ?-option value ...? source ?source ...? target"} test fCmd-3.3 {FileCopyRename: Tcl_TranslateFileName fails} -constraints {notRoot} -body { file rename xyz ~_totally_bogus_user } -returnCodes error -result {user "_totally_bogus_user" doesn't exist} @@ -351,7 +351,7 @@ test fCmd-5.1 {TclFileDeleteCmd: FileForceOption fails} -constraints {notRoot} - } -returnCodes error -result {bad option "-xyz": should be -force or --} test fCmd-5.2 {TclFileDeleteCmd: not enough args} -constraints {notRoot} -body { file delete -force -force -} -returnCodes error -result {wrong # args: should be "file delete ?options? file ?file ...?"} +} -returnCodes error -result {wrong # args: should be "file delete ?-option value ...? file ?file ...?"} test fCmd-5.3 {TclFileDeleteCmd: 1 file} {notRoot} { cleanup createfile tf1 diff --git a/tests/indexObj.test b/tests/indexObj.test index 4c1ef49..b5a3304 100644 --- a/tests/indexObj.test +++ b/tests/indexObj.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: indexObj.test,v 1.15 2006/04/06 18:57:58 dgp Exp $ +# RCS: @(#) $Id: indexObj.test,v 1.16 2008/07/13 23:15:22 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -88,8 +88,8 @@ test indexObj-4.1 {free old internal representation} testindexobj { } {2} test indexObj-5.1 {Tcl_WrongNumArgs} testindexobj { - testwrongnumargs 1 "?option?" mycmd -} "wrong # args: should be \"mycmd ?option?\"" + testwrongnumargs 1 "?-option?" mycmd +} "wrong # args: should be \"mycmd ?-option?\"" test indexObj-5.2 {Tcl_WrongNumArgs} testindexobj { testwrongnumargs 2 "bar" mycmd foo } "wrong # args: should be \"mycmd foo bar\"" diff --git a/tests/interp.test b/tests/interp.test index a9c9e8d..c47b8a7 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.58 2008/07/13 09:03:35 msofer Exp $ +# RCS: @(#) $Id: interp.test,v 1.59 2008/07/13 23:15:22 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.1 @@ -3281,10 +3281,10 @@ test interp-34.12 {time limit extension in callbacks} -setup { test interp-35.1 {interp limit syntax} -body { interp limit -} -returnCodes error -result {wrong # args: should be "interp limit path limitType ?options?"} +} -returnCodes error -result {wrong # args: should be "interp limit path limitType ?-option value ...?"} test interp-35.2 {interp limit syntax} -body { interp limit {} -} -returnCodes error -result {wrong # args: should be "interp limit path limitType ?options?"} +} -returnCodes error -result {wrong # args: should be "interp limit path limitType ?-option value ...?"} test interp-35.3 {interp limit syntax} -body { interp limit {} foo } -returnCodes error -result {bad limit type "foo": must be commands or time} diff --git a/tests/ioCmd.test b/tests/ioCmd.test index 06116d3..47c8daa 100644 --- a/tests/ioCmd.test +++ b/tests/ioCmd.test @@ -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: ioCmd.test,v 1.43 2008/06/06 19:46:38 andreas_kupries Exp $ +# RCS: @(#) $Id: ioCmd.test,v 1.44 2008/07/13 23:15:21 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -192,10 +192,10 @@ test iocmd-7.3 {close command} { test iocmd-8.1 {fconfigure command} { list [catch {fconfigure} msg] $msg -} {1 {wrong # args: should be "fconfigure channelId ?optionName? ?value? ?optionName value?..."}} +} {1 {wrong # args: should be "fconfigure channelId ?-option value ...?"}} test iocmd-8.2 {fconfigure command} { list [catch {fconfigure a b c d e f} msg] $msg -} {1 {wrong # args: should be "fconfigure channelId ?optionName? ?value? ?optionName value?..."}} +} {1 {wrong # args: should be "fconfigure channelId ?-option value ...?"}} test iocmd-8.3 {fconfigure command} { list [catch {fconfigure a b} msg] $msg } {1 {can not find channel named "a"}} diff --git a/tests/lindex.test b/tests/lindex.test index 249acb9..1621fda 100644 --- a/tests/lindex.test +++ b/tests/lindex.test @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: lindex.test,v 1.17 2007/12/13 15:26:06 dgp Exp $ +# RCS: @(#) $Id: lindex.test,v 1.18 2008/07/13 23:15:22 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2.2 @@ -26,7 +26,7 @@ testConstraint testevalex [llength [info commands testevalex]] test lindex-1.1 {wrong # args} testevalex { list [catch {testevalex lindex} result] $result -} "1 {wrong # args: should be \"lindex list ?index...?\"}" +} "1 {wrong # args: should be \"lindex list ?index ...?\"}" # Indices that are lists or convertible to lists @@ -190,7 +190,7 @@ test lindex-8.7 {data reuse} testevalex { test lindex-9.1 {wrong # args} { list [catch {lindex} result] $result -} "1 {wrong # args: should be \"lindex list ?index...?\"}" +} "1 {wrong # args: should be \"lindex list ?index ...?\"}" test lindex-9.2 {ensure that compilation works in the right order} { proc foo {} { rename foo {} diff --git a/tests/lsearch.test b/tests/lsearch.test index 91ac00e..93e2117 100644 --- a/tests/lsearch.test +++ b/tests/lsearch.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: lsearch.test,v 1.20 2007/12/13 15:26:06 dgp Exp $ +# RCS: @(#) $Id: lsearch.test,v 1.21 2008/07/13 23:15:22 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -83,10 +83,10 @@ test lsearch-2.16 {search modes without -nocase} { test lsearch-3.1 {lsearch errors} { list [catch lsearch msg] $msg -} {1 {wrong # args: should be "lsearch ?options? list pattern"}} +} {1 {wrong # args: should be "lsearch ?-option value ...? list pattern"}} test lsearch-3.2 {lsearch errors} { list [catch {lsearch a} msg] $msg -} {1 {wrong # args: should be "lsearch ?options? list pattern"}} +} {1 {wrong # args: should be "lsearch ?-option value ...? list pattern"}} test lsearch-3.3 {lsearch errors} { list [catch {lsearch a b c} msg] $msg } {1 {bad option "a": must be -all, -ascii, -decreasing, -dictionary, -exact, -glob, -increasing, -index, -inline, -integer, -nocase, -not, -real, -regexp, -sorted, -start, or -subindices}} diff --git a/tests/lset.test b/tests/lset.test index 872047b..b6d8758 100644 --- a/tests/lset.test +++ b/tests/lset.test @@ -31,7 +31,7 @@ trace add variable noWrite write failTrace test lset-1.1 {lset, not compiled, arg count} testevalex { list [catch {testevalex lset} msg] $msg -} "1 {wrong \# args: should be \"lset listVar index ?index...? value\"}" +} "1 {wrong \# args: should be \"lset listVar index ?index ...? value\"}" test lset-1.2 {lset, not compiled, no such var} testevalex { list [catch {testevalex {lset noSuchVar 0 {}}} msg] $msg } "1 {can't read \"noSuchVar\": no such variable}" diff --git a/tests/lsetComp.test b/tests/lsetComp.test index 6b9264c..4d0ad2c 100755 --- a/tests/lsetComp.test +++ b/tests/lsetComp.test @@ -36,7 +36,7 @@ test lsetComp-1.1 {lset, compiled, wrong \# args} { evalInProc { lset } -} "1 {wrong \# args: should be \"lset listVar index ?index...? value\"}" +} "1 {wrong \# args: should be \"lset listVar index ?index ...? value\"}" test lsetComp-2.1 {lset, compiled, list of args, not a simple var name} { evalInProc { diff --git a/tests/pkg.test b/tests/pkg.test index 0953eeb..1d94cb3 100644 --- a/tests/pkg.test +++ b/tests/pkg.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: pkg.test,v 1.29 2007/12/13 15:26:07 dgp Exp $ +# RCS: @(#) $Id: pkg.test,v 1.30 2008/07/13 23:15:21 nijtmans Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -648,13 +648,13 @@ test pkg-3.21 {Tcl_PackageCmd procedure, "provide" option} { } {1 {expected version number but got "a.b"}} test pkg-3.22 {Tcl_PackageCmd procedure, "require" option} { list [catch {package require} msg] $msg -} {1 {wrong # args: should be "package require ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package require ?-exact? package ?requirement ...?"}} test pkg-3.24 {Tcl_PackageCmd procedure, "require" option} { list [catch {package require -exact a b c} msg] $msg # Exact syntax: -exact name version - # name ?requirement...? -} {1 {wrong # args: should be "package require ?-exact? package ?requirement...?"}} + # name ?requirement ...? +} {1 {wrong # args: should be "package require ?-exact? package ?requirement ...?"}} test pkg-3.26 {Tcl_PackageCmd procedure, "require" option} { list [catch {package require x a.b} msg] $msg @@ -664,10 +664,10 @@ test pkg-3.27 {Tcl_PackageCmd procedure, "require" option} { } {1 {expected version number but got "a.b"}} test pkg-3.28 {Tcl_PackageCmd procedure, "require" option} { list [catch {package require -exact x} msg] $msg -} {1 {wrong # args: should be "package require ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package require ?-exact? package ?requirement ...?"}} test pkg-3.29 {Tcl_PackageCmd procedure, "require" option} { list [catch {package require -exact} msg] $msg -} {1 {wrong # args: should be "package require ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package require ?-exact? package ?requirement ...?"}} test pkg-3.30 {Tcl_PackageCmd procedure, "require" option} { package forget t package provide t 2.3 @@ -888,13 +888,13 @@ test pkg-7.10 {Tcl_PkgPresent procedure, unknown package} { } {1 {package t 2.4 is not present}} test pkg-7.11 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present} msg] $msg -} {1 {wrong # args: should be "package present ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package present ?-exact? package ?requirement ...?"}} test pkg-7.12 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present a b c} msg] $msg } {1 {expected version number but got "b"}} test pkg-7.13 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present -exact a b c} msg] $msg -} {1 {wrong # args: should be "package present ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package present ?-exact? package ?requirement ...?"}} test pkg-7.14 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present -bs a b} msg] $msg } {1 {expected version number but got "a"}} @@ -906,10 +906,10 @@ test pkg-7.16 {Tcl_PackageCmd procedure, "present" option} { } {1 {expected version number but got "a.b"}} test pkg-7.17 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present -exact x} msg] $msg -} {1 {wrong # args: should be "package present ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package present ?-exact? package ?requirement ...?"}} test pkg-7.18 {Tcl_PackageCmd procedure, "present" option} { list [catch {package present -exact} msg] $msg -} {1 {wrong # args: should be "package present ?-exact? package ?requirement...?"}} +} {1 {wrong # args: should be "package present ?-exact? package ?requirement ...?"}} diff --git a/tests/var.test b/tests/var.test index bf48224..5797434 100644 --- a/tests/var.test +++ b/tests/var.test @@ -14,7 +14,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: var.test,v 1.31 2008/03/11 17:23:56 msofer Exp $ +# RCS: @(#) $Id: var.test,v 1.32 2008/07/13 23:15:22 nijtmans Exp $ # if {[lsearch [namespace children] ::tcltest] == -1} { @@ -503,12 +503,12 @@ test var-7.15 {Tcl_VariableObjCmd, array element parameter} { } "can't define \"arrayvar(1)\": name refers to an element in an array" test var-7.16 {Tcl_VariableObjCmd, no args} { list [catch {variable} msg] $msg -} {1 {wrong # args: should be "variable ?name value...? name ?value?"}} +} {1 {wrong # args: should be "variable ?name value ...? name ?value?"}} test var-7.17 {Tcl_VariableObjCmd, no args} { namespace eval test_ns_var { list [catch {variable} msg] $msg } -} {1 {wrong # args: should be "variable ?name value...? name ?value?"}} +} {1 {wrong # args: should be "variable ?name value ...? name ?value?"}} test var-8.1 {TclDeleteVars, "unset" traces are called with fully-qualified var names} { catch {namespace delete test_ns_var} -- cgit v0.12