diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-19 15:11:31 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2010-04-28 18:22:47 -0700 |
| commit | 1f959ab4d68ce7c963f9d5f3edc64b457565c291 (patch) | |
| tree | 3e3b9905030735ddd69b601524634614fb944ea2 /glsl_parser.ypp | |
| parent | bf783ecea69c6b4a3fb5f616e91707cf6d806040 (diff) | |
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.
Diffstat (limited to 'glsl_parser.ypp')
| -rw-r--r-- | glsl_parser.ypp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glsl_parser.ypp b/glsl_parser.ypp index 250c51c7ee..131f23d8c1 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); |