From: Ian Romanick <ian.d.romanick@intel.com>
Date: Mon, 19 Apr 2010 22:11:31 +0000 (-0700)
Subject: Use IDENTIFIER instead of TYPE_NAME for structure names
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1f959ab4d68ce7c963f9d5f3edc64b457565c291;p=mesa.git

Use IDENTIFIER instead of TYPE_NAME for structure names

Since there is no track of which names are structure names during parsing,
TYPE_NAME cannot be produced by the lexer.  Use IDENTIFIER and let the AST
processor sort it out.
---

diff --git a/glsl_parser.ypp b/glsl_parser.ypp
index 250c51c7ee3..131f23d8c1e 100644
--- a/glsl_parser.ypp
+++ b/glsl_parser.ypp
@@ -84,7 +84,7 @@
 %token ISAMPLER1DARRAY ISAMPLER2DARRAY USAMPLER1D USAMPLER2D USAMPLER3D
 %token USAMPLERCUBE USAMPLER1DARRAY USAMPLER2DARRAY
 %token STRUCT VOID WHILE
-%token <identifier> IDENTIFIER TYPE_NAME
+%token <identifier> IDENTIFIER
 %token <real> FLOATCONSTANT
 %token <n> INTCONSTANT UINTCONSTANT BOOLCONSTANT
 %token <identifier> FIELD_SELECTION
@@ -941,7 +941,7 @@ type_specifier_nonarray:
 	   $$ = new ast_type_specifier($1);
 	   $$->set_location(yylloc);
 	}
-	| TYPE_NAME
+	| IDENTIFIER
 	{
 	   $$ = new ast_type_specifier($1);
 	   $$->set_location(yylloc);