summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--generic/tclUtil.c5
-rw-r--r--tests/regexpComp.test18
3 files changed, 19 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 7504d60..6eb10d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 Jeff Hobbs <jeffh@ActiveState.com>
* tests/regexp.test, tests/regexpComp.test: correct re2glob ***=
diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index ec0f2ff..3b59171 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.97.2.3 2008/08/21 23:42:22 hobbs Exp $
+ * RCS: @(#) $Id: tclUtil.c,v 1.97.2.4 2008/08/22 17:20:37 dgp Exp $
*/
#include "tclInt.h"
@@ -3300,6 +3300,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 0fbed97..df7b60f 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}