1 files changed, 47 insertions, 47 deletions

diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
index 98d500ec0b..6c5057169f 100644
--- a/src/glsl/glcpp/glcpp-lex.l
+++ b/src/glsl/glcpp/glcpp-lex.l
@@ -122,23 +122,23 @@ glcpp_lex_update_state_per_token (glcpp_parser_t *parser, int token)
 {
 	/* After the first non-space token in a line, we won't
 	 * allow any '#' to introduce a directive. */
-	if (token == NEWLINE) {
+	if (token == NEWLINE_TOK) {
 		parser->first_non_space_token_this_line = 1;
-	} else if (token != SPACE) {
+	} else if (token != SPACE_TOK) {
 		parser->first_non_space_token_this_line = 0;
 	}
 
 	/* Track newlines just to know whether a newline needs
 	 * to be inserted if end-of-file comes early. */
-	if (token == NEWLINE) {
+	if (token == NEWLINE_TOK) {
 		parser->last_token_was_newline = 1;
 	} else {
 		parser->last_token_was_newline = 0;
 	}
 
-	/* Track spaces to avoid emitting multiple SPACE
+	/* Track spaces to avoid emitting multiple SPACE_TOK
 	 * tokens in a row. */
-	if (token == SPACE) {
+	if (token == SPACE_TOK) {
 		if (! parser->last_token_was_space) {
 			parser->last_token_was_space = 1;
 			return 1;
@@ -209,7 +209,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 			parser->commented_newlines--;
 		if (parser->commented_newlines == 0)
 			BEGIN INITIAL;
-		RETURN_TOKEN_NEVER_SKIP (NEWLINE);
+		RETURN_TOKEN_NEVER_SKIP (NEWLINE_TOK);
 	}
 
 	/* Set up the parser->skipping bit here before doing any lexing.
@@ -264,7 +264,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	yy_pop_state(yyscanner);
 	/* In the <HASH> start condition, we don't want any SPACE token. */
 	if (yyextra->space_tokens && YY_START != HASH)
-		RETURN_TOKEN (SPACE);
+		RETURN_TOKEN (SPACE_TOK);
 }
 
 {HASH} {
@@ -279,13 +279,13 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 		BEGIN HASH;
 	}
 
-	RETURN_TOKEN_NEVER_SKIP (HASH_TOKEN);
+	RETURN_TOKEN_NEVER_SKIP (HASH_TOK);
 }
 
 <HASH>version{HSPACE}+ {
 	BEGIN INITIAL;
 	yyextra->space_tokens = 0;
-	RETURN_STRING_TOKEN (VERSION_TOKEN);
+	RETURN_STRING_TOKEN (VERSION_TOK);
 }
 
 	/* Swallow empty #pragma directives, (to avoid confusing the
@@ -298,17 +298,17 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	 * Simply pass them through to the main compiler's lexer/parser. */
 <HASH>(extension|pragma)[^\r\n]* {
 	BEGIN INITIAL;
-	RETURN_STRING_TOKEN (PRAGMA);
+	RETURN_STRING_TOKEN (PRAGMA_TOK);
 }
 
 <HASH>line{HSPACE}+ {
 	BEGIN INITIAL;
-	RETURN_TOKEN (LINE);
+	RETURN_TOKEN (LINE_TOK);
 }
 
 <HASH>{NEWLINE} {
 	BEGIN INITIAL;
-	RETURN_TOKEN_NEVER_SKIP (NEWLINE);
+	RETURN_TOKEN_NEVER_SKIP (NEWLINE_TOK);
 }
 
 	/* For the pre-processor directives, we return these tokens
@@ -317,45 +317,45 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	BEGIN INITIAL;
 	yyextra->lexing_directive = 1;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (IFDEF);
+	RETURN_TOKEN_NEVER_SKIP (IFDEF_TOK);
 }
 
 <HASH>ifndef {
 	BEGIN INITIAL;
 	yyextra->lexing_directive = 1;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (IFNDEF);
+	RETURN_TOKEN_NEVER_SKIP (IFNDEF_TOK);
 }
 
 <HASH>if/[^_a-zA-Z0-9] {
 	BEGIN INITIAL;
 	yyextra->lexing_directive = 1;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (IF);
+	RETURN_TOKEN_NEVER_SKIP (IF_TOK);
 }
 
 <HASH>elif/[^_a-zA-Z0-9] {
 	BEGIN INITIAL;
 	yyextra->lexing_directive = 1;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (ELIF);
+	RETURN_TOKEN_NEVER_SKIP (ELIF_TOK);
 }
 
 <HASH>else {
 	BEGIN INITIAL;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (ELSE);
+	RETURN_TOKEN_NEVER_SKIP (ELSE_TOK);
 }
 
 <HASH>endif {
 	BEGIN INITIAL;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN_NEVER_SKIP (ENDIF);
+	RETURN_TOKEN_NEVER_SKIP (ENDIF_TOK);
 }
 
 <HASH>error[^\r\n]* {
 	BEGIN INITIAL;
-	RETURN_STRING_TOKEN (ERROR_TOKEN);
+	RETURN_STRING_TOKEN (ERROR_TOK);
 }
 
 	/* After we see a "#define" we enter the <DEFINE> start state
@@ -380,14 +380,14 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	if (! parser->skipping) {
 		BEGIN DEFINE;
 		yyextra->space_tokens = 0;
-		RETURN_TOKEN (DEFINE_TOKEN);
+		RETURN_TOKEN (DEFINE_TOK);
 	}
 }
 
 <HASH>undef {
 	BEGIN INITIAL;
 	yyextra->space_tokens = 0;
-	RETURN_TOKEN (UNDEF);
+	RETURN_TOKEN (UNDEF_TOK);
 }
 
 <HASH>{HSPACE}+ {
@@ -399,19 +399,19 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	/* This will catch any non-directive garbage after a HASH */
 <HASH>{NONSPACE} {
 	BEGIN INITIAL;
-	RETURN_TOKEN (GARBAGE);
+	RETURN_TOKEN (GARBAGE_TOK);
 }
 
 	/* An identifier immediately followed by '(' */
 <DEFINE>{IDENTIFIER}/"(" {
 	BEGIN INITIAL;
-	RETURN_STRING_TOKEN (FUNC_IDENTIFIER);
+	RETURN_STRING_TOKEN (FUNC_IDENTIFIER_TOK);
 }
 
 	/* An identifier not immediately followed by '(' */
 <DEFINE>{IDENTIFIER} {
 	BEGIN INITIAL;
-	RETURN_STRING_TOKEN (OBJ_IDENTIFIER);
+	RETURN_STRING_TOKEN (OBJ_IDENTIFIER_TOK);
 }
 
 	/* Whitespace */
@@ -423,7 +423,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 <DEFINE>[/][^*]{NONSPACE}* {
 	BEGIN INITIAL;
 	glcpp_error(yylloc, yyextra, "#define followed by a non-identifier: %s", yytext);
-	RETURN_STRING_TOKEN (INTEGER_STRING);
+	RETURN_STRING_TOKEN (INTEGER_STRING_TOK);
 }
 
 	/* A character that can't start an identifier, comment, or
@@ -431,79 +431,79 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 <DEFINE>[^_a-zA-Z/[:space:]]{NONSPACE}* {
 	BEGIN INITIAL;
 	glcpp_error(yylloc, yyextra, "#define followed by a non-identifier: %s", yytext);
-	RETURN_STRING_TOKEN (INTEGER_STRING);
+	RETURN_STRING_TOKEN (INTEGER_STRING_TOK);
 }
 
 {DECIMAL_INTEGER} {
-	RETURN_STRING_TOKEN (INTEGER_STRING);
+	RETURN_STRING_TOKEN (INTEGER_STRING_TOK);
 }
 
 {OCTAL_INTEGER} {
-	RETURN_STRING_TOKEN (INTEGER_STRING);
+	RETURN_STRING_TOKEN (INTEGER_STRING_TOK);
 }
 
 {HEXADECIMAL_INTEGER} {
-	RETURN_STRING_TOKEN (INTEGER_STRING);
+	RETURN_STRING_TOKEN (INTEGER_STRING_TOK);
 }
 
 "<<"  {
-	RETURN_TOKEN (LEFT_SHIFT);
+	RETURN_TOKEN (LEFT_SHIFT_TOK);
 }
 
 ">>" {
-	RETURN_TOKEN (RIGHT_SHIFT);
+	RETURN_TOKEN (RIGHT_SHIFT_TOK);
 }
 
 "<=" {
-	RETURN_TOKEN (LESS_OR_EQUAL);
+	RETURN_TOKEN (LESS_OR_EQUAL_TOK);
 }
 
 ">=" {
-	RETURN_TOKEN (GREATER_OR_EQUAL);
+	RETURN_TOKEN (GREATER_OR_EQUAL_TOK);
 }
 
 "==" {
-	RETURN_TOKEN (EQUAL);
+	RETURN_TOKEN (EQUAL_TOK);
 }
 
 "!=" {
-	RETURN_TOKEN (NOT_EQUAL);
+	RETURN_TOKEN (NOT_EQUAL_TOK);
 }
 
 "&&" {
-	RETURN_TOKEN (AND);
+	RETURN_TOKEN (AND_TOK);
 }
 
 "||" {
-	RETURN_TOKEN (OR);
+	RETURN_TOKEN (OR_TOK);
 }
 
 "++" {
-	RETURN_TOKEN (PLUS_PLUS);
+	RETURN_TOKEN (PLUS_PLUS_TOK);
 }
 
 "--" {
-	RETURN_TOKEN (MINUS_MINUS);
+	RETURN_TOKEN (MINUS_MINUS_TOK);
 }
 
 "##" {
 	if (! parser->skipping) {
 		if (parser->is_gles)
 			glcpp_error(yylloc, yyextra, "Token pasting (##) is illegal in GLES");
-		RETURN_TOKEN (PASTE);
+		RETURN_TOKEN (PASTE_TOK);
 	}
 }
 
 "defined" {
-	RETURN_TOKEN (DEFINED);
+	RETURN_TOKEN (DEFINED_TOK);
 }
 
 {IDENTIFIER} {
-	RETURN_STRING_TOKEN (IDENTIFIER);
+	RETURN_STRING_TOKEN (IDENTIFIER_TOK);
 }
 
 {PP_NUMBER} {
-	RETURN_STRING_TOKEN (OTHER);
+	RETURN_STRING_TOKEN (OTHER_TOK);
 }
 
 {PUNCTUATION} {
@@ -511,12 +511,12 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 }
 
 {OTHER}+ {
-	RETURN_STRING_TOKEN (OTHER);
+	RETURN_STRING_TOKEN (OTHER_TOK);
 }
 
 {HSPACE} {
 	if (yyextra->space_tokens) {
-		RETURN_TOKEN (SPACE);
+		RETURN_TOKEN (SPACE_TOK);
 	}
 }
 
@@ -532,7 +532,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	yyextra->lexing_directive = 0;
 	yylineno++;
 	yycolumn = 0;
-	RETURN_TOKEN_NEVER_SKIP (NEWLINE);
+	RETURN_TOKEN_NEVER_SKIP (NEWLINE_TOK);
 }
 
 <INITIAL,COMMENT,DEFINE,HASH><<EOF>> {
@@ -541,7 +541,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	BEGIN DONE; /* Don't keep matching this rule forever. */
 	yyextra->lexing_directive = 0;
 	if (! parser->last_token_was_newline)
-		RETURN_TOKEN (NEWLINE);
+		RETURN_TOKEN (NEWLINE_TOK);
 }
 
 	/* This is a catch-all to avoid the annoying default flex action which