Index: generic/nsfError.c =================================================================== diff -u -r5abaa156b260f0a0f052cfc6e2f6b2f7eff81e06 -re0da9e0032a357fe5c6bfdd37a2d234e00780460 --- generic/nsfError.c (.../nsfError.c) (revision 5abaa156b260f0a0f052cfc6e2f6b2f7eff81e06) +++ generic/nsfError.c (.../nsfError.c) (revision e0da9e0032a357fe5c6bfdd37a2d234e00780460) @@ -470,7 +470,7 @@ nonnull_assert(methodPathObj != NULL); DSTRING_INIT(dsPtr); - Nsf_DStringPrintf(dsPtr, "invalid non-positional argument '%s', valud are: ", argumentString); + Nsf_DStringPrintf(dsPtr, "invalid non-positional argument '%s', valid are: ", argumentString); for (pPtr = currentParamPtr; (pPtr->name != NULL) && (*pPtr->name == '-'); pPtr ++) { if (pPtr->flags & NSF_ARG_NOCONFIG) { continue; Index: tests/disposition.test =================================================================== diff -u -r275da34d3d7a874a451eced58242b738c8a37d1a -re0da9e0032a357fe5c6bfdd37a2d234e00780460 --- tests/disposition.test (.../disposition.test) (revision 275da34d3d7a874a451eced58242b738c8a37d1a) +++ tests/disposition.test (.../disposition.test) (revision e0da9e0032a357fe5c6bfdd37a2d234e00780460) @@ -200,7 +200,7 @@ ? {[C new -single-np [list -x]] eval {set :single-np}} \ "value for parameter '-x' expected" ? {[C new -single-np [list -x X]] eval {set :single-np}} \ - "invalid non-positional argument '-x X', valid are : -x; + "invalid non-positional argument '-x X', valid are: -x; should be \"::__%&singleton single-np -x /value/\"" # Index: tests/method-parameter.test =================================================================== diff -u -r53113de78cadfd4913718676222d6021d4e7a3fc -re0da9e0032a357fe5c6bfdd37a2d234e00780460 --- tests/method-parameter.test (.../method-parameter.test) (revision 53113de78cadfd4913718676222d6021d4e7a3fc) +++ tests/method-parameter.test (.../method-parameter.test) (revision e0da9e0032a357fe5c6bfdd37a2d234e00780460) @@ -17,15 +17,15 @@ ? {p1 -x} {value for parameter '-x' expected} ? {p1 -x 1} 1 ? {p1 -x 1 2} {invalid argument '2', maybe too many arguments; should be "p1 ?-x /value/?"} - ? {p1 -x 1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {p1 -x 1 -y} {invalid non-positional argument '-y', valid are: -x; should be "p1 ?-x /value/?"} ? {p1 a} {invalid argument 'a', maybe too many arguments; should be "p1 ?-x /value/?"} ? {p1 a -x} {invalid argument 'a', maybe too many arguments; should be "p1 ?-x /value/?"} ? {p1 --} 0 - ? {p1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {p1 -y} {invalid non-positional argument '-y', valid are: -x; should be "p1 ?-x /value/?"} - ? {p1 -y --} {invalid non-positional argument '-y', valid are : -x; + ? {p1 -y --} {invalid non-positional argument '-y', valid are: -x; should be "p1 ?-x /value/?"} # @@ -55,14 +55,14 @@ ? {p2a -x 1 -y} {1 -y} ? {p2a -x 1 -100} {1 -100} - ? {p2b -x 1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {p2b -x 1 -y} {invalid non-positional argument '-y', valid are: -x; should be "p2b ?-x /value/? ?/arg .../?"} ? {p2b -x 1 -100} {1 -100} nsf::proc p3a {a -x -y b:nodashalnum -z} {return [list $a [info exists x] [info exists y] $b]} ? {p3a 100 -x 1 -y 1 200} {100 1 1 200} - ? {p3a 100 -xx 1 -y 1 200} {invalid non-positional argument '-xx', valid are : -x, -y; + ? {p3a 100 -xx 1 -y 1 200} {invalid non-positional argument '-xx', valid are: -x, -y; should be "p3a /a/ ?-x /value/? ?-y /value/? /b/ ?-z /value/?"} } @@ -76,15 +76,15 @@ :public method p1 {-x} {return [list [info exists x]]} :create c1 } - ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are: -x; should be "::c1 p1 ?-x /value/?"} proc ::nsf::argument::unknown {method arg args} { puts stderr "??? unknown nonpos-arg $arg in $method obj <$args>\n[info frame -1]\n" return "" } - ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are: -x; should be "::c1 p1 ?-x /value/?"} if {0} { @@ -95,7 +95,7 @@ return "" } - ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are : -x; + ? {c1 p1 -x 1 -y} {invalid non-positional argument '-y', valid are: -x; should be "::c1 p1 ?-x /value/?"} } } @@ -147,11 +147,11 @@ # variable), then the following command would be perfectly fine. # ? {C info subclasses -a} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a --} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -- -a} "" @@ -178,18 +178,18 @@ # first flag ? {C info subclasses -a b} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -- -a b} \ {invalid argument 'b', maybe too many arguments; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a -- b} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a b --} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} # second flag @@ -209,18 +209,18 @@ # both flag ? {C info subclasses -a -b} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -- -a -b} \ {invalid argument '-b', maybe too many arguments; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a -- -b} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a -b --} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} } @@ -340,11 +340,11 @@ # one argument # ? {C info subclasses -a} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -a --} \ - {invalid non-positional argument '-a', valid are : -closure, -dependent; + {invalid non-positional argument '-a', valid are: -closure, -dependent; should be "::C info subclasses ?-closure? ?-dependent? ?/pattern/?"} ? {C info subclasses -- -a} "::-a" @@ -372,7 +372,7 @@ nsf::proc y {-aaa1 -aa1 -a1 -a} { return [info exists aaa1]-[info exists aa1]-[info exists a1]-[info exists a] } ? {y -a 1} "0-0-0-1" - ? {y -aa 1} {invalid non-positional argument '-aa', valid are : -aaa1, -aa1, -a1, -a; + ? {y -aa 1} {invalid non-positional argument '-aa', valid are: -aaa1, -aa1, -a1, -a; should be "y ?-aaa1 /value/? ?-aa1 /value/? ?-a1 /value/? ?-a /value/?"} ? {y -aaa 1} "1-0-0-0" ? {y -aa1 1} "0-1-0-0" Index: tests/parameters.test =================================================================== diff -u -rf6ddb05b0fe131474053d905d3cf6b581a07488e -re0da9e0032a357fe5c6bfdd37a2d234e00780460 --- tests/parameters.test (.../parameters.test) (revision f6ddb05b0fe131474053d905d3cf6b581a07488e) +++ tests/parameters.test (.../parameters.test) (revision e0da9e0032a357fe5c6bfdd37a2d234e00780460) @@ -2362,7 +2362,7 @@ ? {C create c2 -a 10} ::c2 ? {C create c2 -v 10} \ - {invalid non-positional argument '-v', valid are : -a, -object-mixins, -object-filters, -class; + {invalid non-positional argument '-v', valid are: -a, -object-mixins, -object-filters, -class; should be "::c2 configure ?-a /value/? ?-object-mixins /mixinreg .../? ?-object-filters /filterreg .../? ?-class /class/? ?/__initblock/?"} #