diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tclUtil.c | 5 | ||||
| -rw-r--r-- | tests/regexpComp.test | 18 |
3 files changed, 19 insertions, 10 deletions
@@ -1,3 +1,9 @@ +2008-08-22 Don Porter <dgp@users.sourceforge.net> + + * generic/tclUtil.c (TclReToGlob): Added missing set of the + *exactPtr value to really fix [Bug 2065115]. + * tests/regexpComp.test: Correct duplicate test names. + 2008-08-21 Miguel Sofer <msofer@users.sf.net> * generic/tclBasic.c: Previous fix, now done right. diff --git a/generic/tclUtil.c b/generic/tclUtil.c index 605951c..6f74ad8 100644 --- a/generic/tclUtil.c +++ b/generic/tclUtil.c @@ -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: tclUtil.c,v 1.101 2008/08/21 23:42:13 hobbs Exp $ + * RCS: @(#) $Id: tclUtil.c,v 1.102 2008/08/22 17:26:46 dgp Exp $ */ #include "tclInt.h" @@ -3301,6 +3301,9 @@ TclReToGlob( } *dsStr++ = '*'; Tcl_DStringSetLength(dsPtr, dsStr - dsStrStart); + if (exactPtr) { + *exactPtr = 0; + } return TCL_OK; } diff --git a/tests/regexpComp.test b/tests/regexpComp.test index aaae977..4f05bc3 100644 --- a/tests/regexpComp.test +++ b/tests/regexpComp.test @@ -69,57 +69,57 @@ test regexpComp-1.7 {regexp utf compliance} { } } {0 0} -test regexp-1.8 {regexp ***= metasyntax} { +test regexpComp-1.8 {regexp ***= metasyntax} { evalInProc { regexp -- "***=o" "aeiou" } } 1 -test regexp-1.9 {regexp ***= metasyntax} { +test regexpComp-1.9 {regexp ***= metasyntax} { evalInProc { set string "aeiou" regexp -- "***=o" $string } } 1 -test regexp-1.10 {regexp ***= metasyntax} { +test regexpComp-1.10 {regexp ***= metasyntax} { evalInProc { set string "aeiou" set re "***=o" regexp -- $re $string } } 1 -test regexp-1.11 {regexp ***= metasyntax} { +test regexpComp-1.11 {regexp ***= metasyntax} { evalInProc { regexp -- "***=y" "aeiou" } } 0 -test regexp-1.12 {regexp ***= metasyntax} { +test regexpComp-1.12 {regexp ***= metasyntax} { evalInProc { set string "aeiou" regexp -- "***=y" $string } } 0 -test regexp-1.13 {regexp ***= metasyntax} { +test regexpComp-1.13 {regexp ***= metasyntax} { evalInProc { set string "aeiou" set re "***=y" regexp -- $re $string } } 0 -test regexp-1.14 {regexp ***= metasyntax} { +test regexpComp-1.14 {regexp ***= metasyntax} { evalInProc { set string "aeiou" set re "***=e*o" regexp -- $re $string } } 0 -test regexp-1.15 {regexp ***= metasyntax} { +test regexpComp-1.15 {regexp ***= metasyntax} { evalInProc { set string "ae*ou" set re "***=e*o" regexp -- $re $string } } 1 -test regexp-1.16 {regexp ***= metasyntax} { +test regexpComp-1.16 {regexp ***= metasyntax} { evalInProc { set string {ae*[o]?ua} set re {***=e*[o]?u} |