summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-28 11:08:46 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-01-28 11:08:46 (GMT)
commit33b2c943235d9343253e4dfc60cfb80ca0e064d6 (patch)
tree1fdd72c0c52d3ff402f214a7d35626e9e3558c52 /library
parent82f2bed5fe26cb420a472abc95b92120a84e02cf (diff)
parent8d49123e73e1b0bbbf97cd212e88960772a9e166 (diff)
downloadtcl-33b2c943235d9343253e4dfc60cfb80ca0e064d6.zip
tcl-33b2c943235d9343253e4dfc60cfb80ca0e064d6.tar.gz
tcl-33b2c943235d9343253e4dfc60cfb80ca0e064d6.tar.bz2
Merge 8.6
Diffstat (limited to 'library')
-rw-r--r--library/opt/optparse.tcl2
-rw-r--r--library/tcltest/tcltest.tcl2
2 files changed, 2 insertions, 2 deletions
diff --git a/library/opt/optparse.tcl b/library/opt/optparse.tcl
index 1639379..454b923 100644
--- a/library/opt/optparse.tcl
+++ b/library/opt/optparse.tcl
@@ -601,7 +601,7 @@ proc ::tcl::OptCheckType {arg type {typeArgs ""}} {
return [expr {$arg ? 1 : 0}]
}
choice {
- if {[lsearch -exact $typeArgs $arg] < 0} {
+ if {$arg ni $typeArgs} {
error "invalid choice"
}
return $arg
diff --git a/library/tcltest/tcltest.tcl b/library/tcltest/tcltest.tcl
index 3c58782..eb47963 100644
--- a/library/tcltest/tcltest.tcl
+++ b/library/tcltest/tcltest.tcl
@@ -648,7 +648,7 @@ namespace eval tcltest {
proc IsVerbose {level} {
variable Option
- return [expr {[lsearch -exact $Option(-verbose) $level] >= 0}]
+ return [expr {$level in $Option(-verbose)}]
}
# Default verbosity is to show bodies of failed tests