summaryrefslogtreecommitdiffstats
path: root/tests/regexp.test
diff options
context:
space:
mode:
Diffstat (limited to 'tests/regexp.test')
-rw-r--r--tests/regexp.test255
1 files changed, 204 insertions, 51 deletions
diff --git a/tests/regexp.test b/tests/regexp.test
index 362f425..9fff262 100644
--- a/tests/regexp.test
+++ b/tests/regexp.test
@@ -11,14 +11,15 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-if {[lsearch [namespace children] ::tcltest] == -1} {
+if {"::tcltest" ni [namespace children]} {
package require tcltest 2
namespace import -force ::tcltest::*
}
-testConstraint exec [llength [info commands exec]]
+unset -nocomplain foo
-catch {unset foo}
+testConstraint exec [llength [info commands exec]]
+
test regexp-1.1 {basic regexp operation} {
regexp ab*c abbbc
} 1
@@ -43,7 +44,6 @@ test regexp-1.7 {regexp utf compliance} {
regexp "\u4e4eb q" "a\u4e4eb qw\u5e4e\x4e wq" bar
list [string compare $foo $bar] [regexp 4 $bar]
} {0 0}
-
test regexp-1.8 {regexp ***= metasyntax} {
regexp -- "***=o" "aeiou"
} 1
@@ -119,6 +119,28 @@ test regexp-2.10 {getting substrings back from regexp} {
set f2 {}
list [regexp f\352te(b*)c eff\352tebbbbc foo f2] $foo $f2
} [list 1 f\352tebbbbc bbbb]
+test regexp-2.11 {non-capturing subgroup} {
+ set foo {}
+ set f2 {}
+ list [regexp {str(?:a+)} straa foo f2] $foo $f2
+} [list 1 straa {}]
+test regexp-2.12 {non-capturing subgroup with -inline} {
+ regexp -inline {str(?:a+)} straa
+} {straa}
+test regexp-2.13 {non-capturing and capturing subgroups} {
+ set foo {}
+ set f2 {}
+ set f3 {}
+ list [regexp {str(?:a+)(c+)} straacc foo f2 f3] $foo $f2 $f3
+} [list 1 straacc cc {}]
+test regexp-2.14 {non-capturing and capturing subgroups} {
+ regexp -inline {str(?:a+)(c+)} straacc
+} {straacc cc}
+test regexp-2.15 {getting substrings back from regexp} {
+ set foo NA
+ set f2 NA
+ list [regexp {str(?:a+)} straa foo f2] $foo $f2
+} [list 1 straa {}]
test regexp-3.1 {-indices option to regexp} {
set foo {}
@@ -174,7 +196,7 @@ set x $x$x$x$x$x$x$x$x$x$x$x$x
test regexp-4.4 {case conversion in regexp} {
list [regexp -nocase $x $x foo] $foo
} "1 $x"
-catch {unset x}
+unset -nocomplain x
test regexp-5.1 {exercise cache of compiled expressions} {
regexp .*a b
@@ -219,13 +241,13 @@ test regexp-5.5 {exercise cache of compiled expressions} {
test regexp-6.1 {regexp errors} {
list [catch {regexp a} msg] $msg
-} {1 {wrong # args: should be "regexp ?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?"}}
+} {1 {wrong # args: should be "regexp ?-option ...? exp string ?matchVar? ?subMatchVar ...?"}}
test regexp-6.2 {regexp errors} {
list [catch {regexp -nocase a} msg] $msg
-} {1 {wrong # args: should be "regexp ?switches? exp string ?matchVar? ?subMatchVar subMatchVar ...?"}}
+} {1 {wrong # args: should be "regexp ?-option ...? exp string ?matchVar? ?subMatchVar ...?"}}
test regexp-6.3 {regexp errors} {
list [catch {regexp -gorp a} msg] $msg
-} {1 {bad switch "-gorp": must be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}}
+} {1 {bad option "-gorp": must be -all, -about, -indices, -inline, -expanded, -line, -linestop, -lineanchor, -nocase, -start, or --}}
test regexp-6.4 {regexp errors} {
list [catch {regexp a( b} msg] $msg
} {1 {couldn't compile regular expression pattern: parentheses () not balanced}}
@@ -238,14 +260,18 @@ test regexp-6.6 {regexp errors} {
test regexp-6.7 {regexp errors} {
list [catch {regexp (x)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.)(.) xyzzy} msg] $msg
} {0 0}
-test regexp-6.8 {regexp errors} {
- catch {unset f1}
+test regexp-6.8 {regexp errors} -setup {
+ unset -nocomplain f1
+} -body {
set f1 44
- list [catch {regexp abc abc f1(f2)} msg] $msg
-} {1 {couldn't set variable "f1(f2)"}}
+ regexp abc abc f1(f2)
+} -returnCodes error -result {can't set "f1(f2)": variable isn't array}
test regexp-6.9 {regexp errors, -start bad int check} {
list [catch {regexp -start bogus {^$} {}} msg] $msg
} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}}
+test regexp-6.10 {regexp errors} {
+ list [catch {regexp {a[} b} msg] $msg
+} {1 {couldn't compile regular expression pattern: brackets [] not balanced}}
test regexp-7.1 {basic regsub operation} {
list [regsub aa+ xaxaaaxaa 111&222 foo] $foo
@@ -305,6 +331,42 @@ test regexp-7.17 {regsub utf compliance} {
regsub a\u4e4eb xyza\u4e4ebijka\u4e4ebpqr 555 bar
list [string compare $foo $bar] [regexp 4 $bar]
} {0 0}
+test regexp-7.18 {basic regsub replacement} {
+ list [regsub a+ aaa {&} foo] $foo
+} {1 aaa}
+test regexp-7.19 {basic regsub replacement} {
+ list [regsub a+ aaa {\&} foo] $foo
+} {1 &}
+test regexp-7.20 {basic regsub replacement} {
+ list [regsub a+ aaa {\\&} foo] $foo
+} {1 {\aaa}}
+test regexp-7.21 {basic regsub replacement} {
+ list [regsub a+ aaa {\\\&} foo] $foo
+} {1 {\&}}
+test regexp-7.22 {basic regsub replacement} {
+ list [regsub a+ aaa {\0} foo] $foo
+} {1 aaa}
+test regexp-7.23 {basic regsub replacement} {
+ list [regsub a+ aaa {\\0} foo] $foo
+} {1 {\0}}
+test regexp-7.24 {basic regsub replacement} {
+ list [regsub a+ aaa {\\\0} foo] $foo
+} {1 {\aaa}}
+test regexp-7.25 {basic regsub replacement} {
+ list [regsub a+ aaa {\\\\0} foo] $foo
+} {1 {\\0}}
+test regexp-7.26 {dollar zero is not a backslash replacement} {
+ list [regsub a+ aaa {$0} foo] $foo
+} {1 {$0}}
+test regexp-7.27 {dollar zero is not a backslash replacement} {
+ list [regsub a+ aaa {\0$0} foo] $foo
+} {1 {aaa$0}}
+test regexp-7.28 {dollar zero is not a backslash replacement} {
+ list [regsub a+ aaa {\$0} foo] $foo
+} {1 {\$0}}
+test regexp-7.29 {dollar zero is not a backslash replacement} {
+ list [regsub a+ aaa {\\} foo] $foo
+} {1 \\}
test regexp-8.1 {case conversion in regsub} {
list [regsub -nocase a(a+) xaAAaAAay & foo] $foo
@@ -379,27 +441,28 @@ test regexp-10.5 {inverse partial newline sensitivity in regsub} {
test regexp-11.1 {regsub errors} {
list [catch {regsub a b} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec ?varName?"}}
+} {1 {wrong # args: should be "regsub ?-option ...? exp string subSpec ?varName?"}}
test regexp-11.2 {regsub errors} {
list [catch {regsub -nocase a b} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec ?varName?"}}
+} {1 {wrong # args: should be "regsub ?-option ...? exp string subSpec ?varName?"}}
test regexp-11.3 {regsub errors} {
list [catch {regsub -nocase -all a b} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec ?varName?"}}
+} {1 {wrong # args: should be "regsub ?-option ...? exp string subSpec ?varName?"}}
test regexp-11.4 {regsub errors} {
list [catch {regsub a b c d e f} msg] $msg
-} {1 {wrong # args: should be "regsub ?switches? exp string subSpec ?varName?"}}
+} {1 {wrong # args: should be "regsub ?-option ...? exp string subSpec ?varName?"}}
test regexp-11.5 {regsub errors} {
list [catch {regsub -gorp a b c} msg] $msg
-} {1 {bad switch "-gorp": must be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}}
+} {1 {bad option "-gorp": must be -all, -nocase, -expanded, -line, -linestop, -lineanchor, -start, or --}}
test regexp-11.6 {regsub errors} {
list [catch {regsub -nocase a( b c d} msg] $msg
} {1 {couldn't compile regular expression pattern: parentheses () not balanced}}
-test regexp-11.7 {regsub errors} {
- catch {unset f1}
+test regexp-11.7 {regsub errors} -setup {
+ unset -nocomplain f1
+} -body {
set f1 44
- list [catch {regsub -nocase aaa aaa xxx f1(f2)} msg] $msg
-} {1 {couldn't set variable "f1(f2)"}}
+ regsub -nocase aaa aaa xxx f1(f2)
+} -returnCodes error -result {can't set "f1(f2)": variable isn't array}
test regexp-11.8 {regsub errors, -start bad int check} {
list [catch {regsub -start bogus pattern string rep var} msg] $msg
} {1 {bad index "bogus": must be integer?[+-]integer? or end?[+-]integer?}}
@@ -425,10 +488,8 @@ test regexp-12.1 {Tcl_RegExpExec: large number of subexpressions} {macCrash} {
} {1 abcdefghijklmnopqrstuvwxyz a b c d e f g h i j k l m n o p q r s t u v w x y z}
test regexp-13.1 {regsub of a very large string} {
- # This test is designed to stress the memory subsystem in order
- # to catch Bug #933. It only fails if the Tcl memory allocator
- # is in use.
-
+ # This test is designed to stress the memory subsystem in order to catch
+ # Bug #933. It only fails if the Tcl memory allocator is in use.
set line {BEGIN_TABLE ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; END_TABLE}
set filedata [string repeat $line 200]
for {set i 1} {$i<10} {incr i} {
@@ -458,7 +519,7 @@ test regexp-14.2 {CompileRegexp: regexp cache, different flags} {
regexp -nocase $x bbba
} 1
test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} -constraints {
- exec
+ exec
} -setup {
set junk [makeFile {puts [regexp {} foo]} junk.tcl]
} -body {
@@ -468,23 +529,23 @@ test regexp-14.3 {CompileRegexp: regexp cache, empty regexp and empty cache} -co
} -result 1
test regexp-15.1 {regexp -start} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start -10 {\d} 1abc2de3 x] $x
} {1 1}
test regexp-15.2 {regexp -start} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start 2 {\d} 1abc2de3 x] $x
} {1 2}
test regexp-15.3 {regexp -start} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start 4 {\d} 1abc2de3 x] $x
} {1 2}
test regexp-15.4 {regexp -start} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start 5 {\d} 1abc2de3 x] $x
} {1 3}
test regexp-15.5 {regexp -start, over end of string} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start [string length 1abc2de3] {\d} 1abc2de3 x] [info exists x]
} {0 0}
test regexp-15.6 {regexp -start, loss of ^$ behavior} {
@@ -497,24 +558,28 @@ test regexp-15.8 {regexp -start, double option} {
regexp -start 0 -start 2 a abc
} 0
test regexp-15.9 {regexp -start, end relative index} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start end {\d} 1abc2de3 x] [info exists x]
} {0 0}
test regexp-15.10 {regexp -start, end relative index} {
- catch {unset x}
+ unset -nocomplain x
list [regexp -start end-1 {\d} 1abc2de3 x] [info exists x] $x
} {1 1 3}
+test regexp-15.11 {regexp -start, over end of string} {
+ set x NA
+ list [regexp -start 2 {.*} ab x] $x
+} {1 {}}
test regexp-16.1 {regsub -start} {
- catch {unset x}
+ unset -nocomplain x
list [regsub -all -start 2 {\d} a1b2c3d4e5 {/&} x] $x
} {4 a1b/2c/3d/4e/5}
test regexp-16.2 {regsub -start} {
- catch {unset x}
+ unset -nocomplain x
list [regsub -all -start -25 {z} hello {/&} x] $x
} {0 hello}
test regexp-16.3 {regsub -start} {
- catch {unset x}
+ unset -nocomplain x
list [regsub -all -start 3 {z} hello {/&} x] $x
} {0 hello}
test regexp-16.4 {regsub -start, \A behavior} {
@@ -534,6 +599,62 @@ test regexp-16.7 {regexp -start, end relative index} {
test regexp-16.8 {regexp -start, end relative index} {
list [regsub -start end-1 a aaa b x] $x
} {1 aab}
+test regexp-16.9 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 0 -all x+ axxxbxx |&| foo] $foo
+} {2 a|xxx|b|xx|}
+test regexp-16.10 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 1 -all x+ axxxbxx |&| foo] $foo
+} {2 a|xxx|b|xx|}
+test regexp-16.11 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 4 -all x+ axxxbxx |&| foo] $foo
+} {1 axxxb|xx|}
+test regexp-16.12 {regsub -start} {
+ set foo {}
+ list [regsub -start 4 x+ axxxbxx |&| foo] $foo
+} {1 axxxb|xx|}
+test regexp-16.13 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 1 -all a+ "" & foo] $foo
+} {0 {}}
+test regexp-16.14 {regsub -start} {
+ set foo {}
+ list [regsub -start 1 a+ "" & foo] $foo
+} {0 {}}
+test regexp-16.15 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 2 -all a+ "xy" & foo] $foo
+} {0 xy}
+test regexp-16.16 {regsub -start} {
+ set foo {}
+ list [regsub -start 2 a+ "xy" & foo] $foo
+} {0 xy}
+test regexp-16.17 {regsub -start and -all} {
+ set foo {}
+ list [regsub -start 1 -all y+ "xy" & foo] $foo
+} {1 xy}
+test regexp-16.18 {regsub -start} {
+ set foo {}
+ list [regsub -start 1 y+ "xy" & foo] $foo
+} {1 xy}
+test regexp-16.19 {regsub -start} {
+ set foo {}
+ list [regsub -start -1 a+ "" & foo] $foo
+} {0 {}}
+test regexp-16.20 {regsub -start, loss of ^$ behavior} {
+ set foo NA
+ list [regsub -start 1 {^$} {} & foo] $foo
+} {0 {}}
+test regexp-16.21 {regsub -start, loss of ^$ behavior} {
+ set foo NA
+ list [regsub -start 1 {^.*$} abc & foo] $foo
+} {0 abc}
+test regexp-16.22 {regsub -start, loss of ^$ behavior} {
+ set foo NA
+ list [regsub -all -start 1 {^.*$} abc & foo] $foo
+} {0 abc}
test regexp-17.1 {regexp -inline} {
regexp -inline b ababa
@@ -613,6 +734,12 @@ test regexp-19.1 {regsub null replacement} {
list $result [string length $result]
} "\0a\0hel\0a\0lo\0a\0 14"
+test regexp-19.2 {regsub null replacement} {
+ regsub -all {@} {@hel@lo@} "\0a\0" result
+ set expected "\0a\0hel\0a\0lo\0a\0"
+ string equal $result $expected
+} 1
+
test regexp-20.1 {regsub shared object shimmering} {
# Bug #461322
set a abcdefghijklmnopqurstuvwxyz
@@ -620,7 +747,7 @@ test regexp-20.1 {regsub shared object shimmering} {
set c abcdefghijklmnopqurstuvwxyz0123456789
regsub $a $c $b d
list $d [string length $d] [string bytelength $d]
-} {abcdefghijklmnopqurstuvwxyz0123456789 37 37}
+} [list abcdefghijklmnopqurstuvwxyz0123456789 37 37]
test regexp-20.2 {regsub shared object shimmering with -about} {
eval regexp -about abc
} {0 {}}
@@ -664,6 +791,27 @@ test regexp-21.12 {multiple matches handle newlines} {
test regexp-21.13 {multiple matches handle newlines} {
regexp -all -inline -indices -line -- ^ "a\nb\nc"
} {{0 -1} {2 1} {4 3}}
+test regexp-21.14 {regsub works with empty string} {
+ regsub -- ^ {} &
+} {}
+test regexp-21.15 {regsub works with empty string} {
+ regsub -- ^ {} foo&
+} {foo}
+test regexp-21.16 {regsub works with empty string} {
+ regsub -all -- ^ {} foo&
+} {foo}
+test regexp-21.17 {regsub works with empty string} {
+ regsub -- ^ {} {foo\0}
+} {foo}
+test regexp-21.18 {regsub works with empty string} {
+ regsub -- ^.* {} {foo$0}
+} {foo$0}
+test regexp-21.19 {regsub works with empty string} {
+ regsub -- ^ {input} {}
+} {input}
+test regexp-21.20 {regsub works with empty string} {
+ regsub -- x {} {foo}
+} {}
test regexp-22.1 {Bug 1810038} {
regexp ($|^X)* {}
@@ -716,7 +864,7 @@ test regexp-22.4 {Bug 3606139} -setup {
[a 668]([a 55])[a 668]([a 55])[a 668]([a 55])[a 511]] {}] a
} -cleanup {
rename a {}
-} -returnCodes 1 -result {couldn't compile regular expression pattern: nfa has too many states}
+} -returnCodes 1 -match glob -result {couldn't compile regular expression pattern: *}
test regexp-22.5 {Bug 3610026} -setup {
set e {}
set cp 99
@@ -822,7 +970,7 @@ test regexp-24.2 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "2 {<>\n<>} 2 {<>\n<>} 2 {<>\n<>}"
+} [list 2 "<>\n<>" 2 "<>\n<>" 2 "<>\n<>"]
test regexp-24.3 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "\n\n"
@@ -830,7 +978,7 @@ test regexp-24.3 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "3 {<>\n<>\n<>} 3 {<>\n<>\n<>} 3 {<>\n<>\n<>}"
+} [list 3 "<>\n<>\n<>" 3 "<>\n<>\n<>" 3 "<>\n<>\n<>"]
test regexp-24.4 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "a"
@@ -838,7 +986,7 @@ test regexp-24.4 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} {1 <>a 1 <a> 1 a<>}
+} [list 1 "<>a" 1 "<a>" 1 "a<>"]
test regexp-24.5 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "a\n"
@@ -846,7 +994,7 @@ test regexp-24.5 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "2 {<>a\n<>} 2 {<a>\n<>} 2 {a<>\n<>}"
+} [list 2 "<>a\n<>" 2 "<a>\n<>" 2 "a<>\n<>"]
test regexp-24.6 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "\na"
@@ -854,7 +1002,7 @@ test regexp-24.6 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "2 {<>\n<>a} 2 {<>\n<a>} 2 {<>\na<>}"
+} [list 2 "<>\n<>a" 2 "<>\n<a>" 2 "<>\na<>"]
test regexp-24.7 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "ab\n"
@@ -862,7 +1010,7 @@ test regexp-24.7 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "2 {<>ab\n<>} 2 {<ab>\n<>} 2 {ab<>\n<>}"
+} [list 2 "<>ab\n<>" 2 "<ab>\n<>" 2 "ab<>\n<>"]
test regexp-24.8 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "a\nb"
@@ -870,7 +1018,7 @@ test regexp-24.8 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "2 {<>a\n<>b} 2 {<a>\n<b>} 2 {a<>\nb<>}"
+} [list 2 "<>a\n<>b" 2 "<a>\n<b>" 2 "a<>\nb<>"]
test regexp-24.9 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "a\nb\n"
@@ -878,7 +1026,7 @@ test regexp-24.9 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "3 {<>a\n<>b\n<>} 3 {<a>\n<b>\n<>} 3 {a<>\nb<>\n<>}"
+} [list 3 "<>a\n<>b\n<>" 3 "<a>\n<b>\n<>" 3 "a<>\nb<>\n<>"]
test regexp-24.10 {regsub -all and -line} {
foreach {v1 v2 v3} {{} {} {}} {}
set string "a\nb\nc"
@@ -886,7 +1034,7 @@ test regexp-24.10 {regsub -all and -line} {
[regsub -line -all {^} $string {<&>} v1] $v1 \
[regsub -line -all {^.*$} $string {<&>} v2] $v2 \
[regsub -line -all {$} $string {<&>} v3] $v3
-} "3 {<>a\n<>b\n<>c} 3 {<a>\n<b>\n<c>} 3 {a<>\nb<>\nc<>}"
+} [list 3 "<>a\n<>b\n<>c" 3 "<a>\n<b>\n<c>" 3 "a<>\nb<>\nc<>"]
test regexp-24.11 {regsub -all and -line} {
regsub -line -all {b} "abb\nb" {<&>}
} "a<b><b>\n<b>"
@@ -894,7 +1042,7 @@ test regexp-24.11 {regsub -all and -line} {
test regexp-25.1 {regexp without -line option} {
set foo ""
list [regexp {a.*b} "dabc\naxyb\n" foo] $foo
-} "1 {abc\naxyb}"
+} [list 1 abc\naxyb]
test regexp-25.2 {regexp without -line option} {
set foo ""
list [regexp {^a.*b$} "dabc\naxyb\n" foo] $foo
@@ -941,6 +1089,7 @@ test regexp-26.3 {effect of -line -all and -start} {
[regexp -all -inline -line -start 3 -- {^a+} "aab\naaa"] \
[regexp -all -inline -line -start 4 -- {^a+} "aab\naaa"] \
} {{aa aaa} aaa aaa aaa}
+# No regexp-26.4
test regexp-26.5 {match length 0, match length 1} {
regexp -all -inline -line -- {^b*} "a\nb"
} {{} b}
@@ -957,11 +1106,11 @@ test regexp-26.7 {Tcl bug 2826551: -line sensitive regexp and -start} {
test regexp-26.8 {Tcl bug 2826551: diff regexp with -line option} {
set data "@1\n2\n+3\n@4\n-5\n+6\n7\n@8\n9\n"
regexp -all -inline -line {^@.*\n(?:[^@].*\n?)*} $data
-} "{@1\n2\n+3\n} {@4\n-5\n+6\n7\n} {@8\n9\n}"
+} [list "@1\n2\n+3\n" "@4\n-5\n+6\n7\n" "@8\n9\n"]
test regexp-26.9 {Tcl bug 2826551: diff regexp with embedded -line option} {
set data "@1\n2\n+3\n@4\n-5\n+6\n7\n@8\n9\n"
regexp -all -inline {(?n)^@.*\n(?:[^@].*\n?)*} $data
-} "{@1\n2\n+3\n} {@4\n-5\n+6\n7\n} {@8\n9\n}"
+} [list "@1\n2\n+3\n" "@4\n-5\n+6\n7\n" "@8\n9\n"]
test regexp-26.10 {regexp with -line option} {
regexp -all -inline -line -- {a*} "a\n"
} {a {}}
@@ -974,7 +1123,11 @@ test regexp-26.12 {regexp with -line option} {
test regexp-26.13 {regexp without -line option} {
regexp -all -inline -- {a*} "b\n"
} {{} {}}
-
+
# cleanup
::tcltest::cleanupTests
return
+
+# Local Variables:
+# mode: tcl
+# End: