Mesa (master): glcpp: Remove trailing contexts from #if rules.

Kenneth Graunke kwg at kemper.freedesktop.org
Thu Mar 3 18:42:49 UTC 2011


Module: Mesa
Branch: master
Commit: 09e1bebc25140eecafa0c3eacefcf63010ce4f10
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=09e1bebc25140eecafa0c3eacefcf63010ce4f10

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Mar  3 09:52:36 2011 -0800

glcpp: Remove trailing contexts from #if rules.

These are now unnecessary.

---

 src/glsl/glcpp/glcpp-lex.l |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 2c9eda6..68e44eb 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -149,36 +149,36 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 }
 
 <SKIP,INITIAL>{
-{HASH}ifdef/.*\n {
+{HASH}ifdef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFDEF;
 }
 
-{HASH}ifndef/.*\n {
+{HASH}ifndef {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IFNDEF;
 }
 
-{HASH}if/[^_a-zA-Z0-9].*\n {
+{HASH}if/[^_a-zA-Z0-9] {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_IF;
 }
 
-{HASH}elif/.*\n {
+{HASH}elif {
 	yyextra->lexing_if = 1;
 	yyextra->space_tokens = 0;
 	return HASH_ELIF;
 }
 
-{HASH}else/.*\n {
+{HASH}else {
 	yyextra->space_tokens = 0;
 	return HASH_ELSE;
 }
 
-{HASH}endif/.*\n {
+{HASH}endif {
 	yyextra->space_tokens = 0;
 	return HASH_ENDIF;
 }




More information about the mesa-commit mailing list