From: Carl Worth <cworth@cworth.org>
Date: Wed, 2 Jun 2010 19:54:15 +0000 (-0700)
Subject: Factor out common sub-expression from multi-line-comment regular expression.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=111e25bd84fb923bbab5b0ca76bbbb5d9a537a26;p=mesa.git

Factor out common sub-expression from multi-line-comment regular expression.

In two places we look for an (optional) sequence of characters other
than "*" followed by a sequence of on or more "*". Using a name for
this (NON_STARS_THEN_STARS) seems to make it a bit easier to
understand.
---

diff --git a/glcpp-lex.l b/glcpp-lex.l
index 2aec46a2ed1..0d9a75415a3 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -45,6 +45,8 @@ DECIMAL_INTEGER		[1-9][0-9]*[uU]?
 OCTAL_INTEGER		0[0-7]*[uU]?
 HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 
+NON_STARS_THEN_STARS	[^*]*[*]+
+
 %%
 
 	/* Single-line comments */
@@ -53,7 +55,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 }
 
 	/* Multi-line comments */
-"/*"([^*]*[*]+[^*/])*[^*]*[*]+"/" {
+"/*"({NON_STARS_THEN_STARS}[^*/])*{NON_STARS_THEN_STARS}"/" {
 	if (yyextra->space_tokens)
 		return SPACE;
 }