about summary refs log tree commit diff
path: root/posix/bug-regex11.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-10-02 22:41:11 +0000
committerUlrich Drepper <drepper@redhat.com>2003-10-02 22:41:11 +0000
commit134abcb5b9ba854fec25051cd3c9f88e760913c5 (patch)
tree3988d22ca828c20e2fa396d7b021915a5d6f47e6 /posix/bug-regex11.c
parentb77ca0e82754c1b0615e5ca6acd343018ffcb287 (diff)
downloadglibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.tar.gz
glibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.tar.xz
glibc-134abcb5b9ba854fec25051cd3c9f88e760913c5.zip
Update.
2003-09-26  Paolo Bonzini  <bonzini@gnu.org>

	* posix/regcomp.c (parse_sub_exp): Pass RE_CARET_ANCHORS_HERE
	for the first token in a subexpression as well.

2003-10-02  Jakub Jelinek  <jakub@redhat.com>

	* posix/regcomp.c (peek_token): Add 2003-09-20 changes for anchor
	handling again.
	(parse_reg_exp): Likewise.
	* posix/regex.h (RE_CARET_ANCHORS_HERE): Define.

	* posix/bug-regex11.c (tests): Add new tests.
	* posix/bug-regex12.c (tests): Add new test.
Diffstat (limited to 'posix/bug-regex11.c')
-rw-r--r--posix/bug-regex11.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/posix/bug-regex11.c b/posix/bug-regex11.c
index 681888c8a0..40fd7c27f5 100644
--- a/posix/bug-regex11.c
+++ b/posix/bug-regex11.c
@@ -1,5 +1,5 @@
 /* Regular expression tests.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
 
@@ -41,7 +41,17 @@ struct
     { { 0, 21 }, { 8, 9 }, { 9, 10 } } },
   { "^\\(a*\\)\\1\\{9\\}\\(a\\{0,9\\}\\)\\([0-9]*;.*[^a]\\2\\([0-9]\\)\\)",
     "a1;;0a1aa2aaa3aaaa4aaaaa5aaaaaa6aaaaaaa7aaaaaaaa8aaaaaaaaa9aa2aa1a0", 0,
-    5, { { 0, 67 }, { 0, 0 }, { 0, 1 }, { 1, 67 }, { 66, 67 } } }
+    5, { { 0, 67 }, { 0, 0 }, { 0, 1 }, { 1, 67 }, { 66, 67 } } },
+  /* Test for BRE expression anchoring.  POSIX says just that this may match;
+     in glibc regex it always matched, so avoid changing it.  */
+  { "\\(^\\|foo\\)bar", "bar", 0, 2, { { 0, 3 }, { -1, -1 } } },
+  { "\\(foo\\|^\\)bar", "bar", 0, 2, { { 0, 3 }, { -1, -1 } } },
+  /* In ERE this must be treated as an anchor.  */
+  { "(^|foo)bar", "bar", REG_EXTENDED, 2, { { 0, 3 }, { -1, -1 } } },
+  { "(foo|^)bar", "bar", REG_EXTENDED, 2, { { 0, 3 }, { -1, -1 } } },
+  /* Here ^ cannot be treated as an anchor according to POSIX.  */
+  { "(^|foo)bar", "(^|foo)bar", 0, 2, { { 0, 10 }, { -1, -1 } } },
+  { "(foo|^)bar", "(foo|^)bar", 0, 2, { { 0, 10 }, { -1, -1 } } },
 };
 
 int