Fix regexp parsing with RE_CONTEXT_INDEP_OPS

[Andreas Schwab]

Jakub Jelinek <jakub@redhat.com> writes:

> Then please add that into glibc testsuite as well.

Ok.

> Or rxspencer/tests if you think it comes really from Spencer.
> What surprises me is that (*)b actually doesn't come from Spencer's
> testsuite, at least not rxspencer-alpha3.8.g3.tar.bz2.

It's in tests/spencer1.tests in the grep sources, whereas the
rxspencer tests are in tests/spencer2.tests, AFAICS.  Posixly the
behaviour of "(*)" is undefined, which is probably why it's not in
rxspencer.  But it looks like it's part of traditional egrep
behaviour, the spencer1 tests have been part of grep at least since
version 2.0.

Andreas.

2003-12-13  Andreas Schwab  <schwab@suse.de>

	* posix/regcomp.c (parse_expression): Don't recurse when the end
	of a subexp is seen after a repetition operator with
	RE_CONTEXT_INVALID_DUP.
        * posix/bug-regex13.c: Add test for "(*)b".

--- posix/bug-regex13.c.~1.3.~	2002-12-03 00:42:00.000000000 +0100
+++ posix/bug-regex13.c	2003-12-13 12:47:48.000000000 +0100
@@ -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 Isamu Hasegawa <isamu@yamato.ibm.com>, 2002.
 
@@ -34,7 +34,8 @@ static struct
 } tests[] = {
   {RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "1", -1}, /* It should not match.  */
   {RE_BACKSLASH_ESCAPE_IN_LISTS, "[0\\-9]", "-", 0}, /* It should match.  */
-  {RE_SYNTAX_POSIX_BASIC, "s1\n.*\ns3", "s1\ns2\ns3", 0}
+  {RE_SYNTAX_POSIX_BASIC, "s1\n.*\ns3", "s1\ns2\ns3", 0},
+  {RE_SYNTAX_EGREP, "(*)b", "b", 0}
 };
 
 int
--- posix/regcomp.c.~1.67.~	2003-11-30 00:08:06.000000000 +0100
+++ posix/regcomp.c	2003-12-13 09:59:26.000000000 +0100
@@ -2191,6 +2191,8 @@ parse_expression (regexp, preg, token, s
       else if (syntax & RE_CONTEXT_INDEP_OPS)
 	{
 	  fetch_token (token, regexp, syntax);
+	  if (token->type == OP_CLOSE_SUBEXP || token->type == OP_ALT)
+	    return NULL;
 	  return parse_expression (regexp, preg, token, syntax, nest, err);
 	}
       /* else fall through  */

-- 
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux AG, Maxfeldstraße 5, 90409 Nürnberg, Germany
Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."