summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-19 07:20:52 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-19 07:20:52 (GMT)
commite3afa124209feea2c83bdd8b506ddd3974647cb4 (patch)
treebed1cddeb048c56fe9cc85f30adc23f49943385b
parent345894cae91f9e72bbbfd6264ab98a2263d9dd1b (diff)
parent7bfe776283e21b9f434c9b47c2ac37b8451f41e8 (diff)
downloadtcl-e3afa124209feea2c83bdd8b506ddd3974647cb4.zip
tcl-e3afa124209feea2c83bdd8b506ddd3974647cb4.tar.gz
tcl-e3afa124209feea2c83bdd8b506ddd3974647cb4.tar.bz2
Merge 8.6
-rw-r--r--generic/regc_lex.c2
-rw-r--r--tests/reg.test4
2 files changed, 5 insertions, 1 deletions
diff --git a/generic/regc_lex.c b/generic/regc_lex.c
index 2c0ddeb..bad91ce 100644
--- a/generic/regc_lex.c
+++ b/generic/regc_lex.c
@@ -427,7 +427,7 @@ next(
if (INCON(L_BBND) && NEXT1('}')) {
v->now++;
INTOCON(L_BRE);
- RET('}');
+ RETV('}', 1);
} else {
FAILW(REG_BADBR);
}
diff --git a/tests/reg.test b/tests/reg.test
index 3c9020d..5ebc2f9 100644
--- a/tests/reg.test
+++ b/tests/reg.test
@@ -1221,6 +1221,10 @@ test reg-33.29 {} {
test reg-33.30 {Bug 1080042} {
regexp {(\Y)+} foo
} 1
+test reg-33.31 {Bug 7c64aa5e1a} {
+ regexp -inline {(?b).\{1,10\}} {abcdef}
+} abcdef
+
# cleanup
::tcltest::cleanupTests