fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 17:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl2: Append _TOK to some parser tokens

Browse source 
This prevents conflicts with defines elsewhere in Mesa and allows
including mtypes.h in the compiler.
This commit is contained in:
Ian Romanick 2010-06-30 16:40:47 -07:00
parent 06143ea094
commit efb6b24223
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/glsl/glsl_lexer.lpp
View file

@ -105,7 +105,7 @@ HASH ^{SPC}#{SPC}
\n { yylineno++; yycolumn = 0; }
attribute return ATTRIBUTE;
const return CONST;
const return CONST_TOK;
bool return BOOL;
float return FLOAT;
int return INT;
@ -272,10 +272,10 @@ packed return PACKED;
goto return GOTO;
switch return SWITCH;
default return DEFAULT;
inline return INLINE;
inline return INLINE_TOK;
noinline return NOINLINE;
volatile return VOLATILE;
public return PUBLIC;
public return PUBLIC_TOK;
static return STATIC;
extern return EXTERN;
external return EXTERNAL;

8
src/glsl/glsl_parser.ypp
View file

@ -70,7 +70,7 @@
} for_rest_statement;
}
%token ATTRIBUTE CONST BOOL FLOAT INT UINT
%token ATTRIBUTE CONST_TOK BOOL FLOAT INT UINT
%token BREAK CONTINUE DO ELSE FOR IF DISCARD RETURN SWITCH CASE DEFAULT
%token BVEC2 BVEC3 BVEC4 IVEC2 IVEC3 IVEC4 UVEC2 UVEC3 UVEC4 VEC2 VEC3 VEC4
%token MAT2 MAT3 MAT4 CENTROID IN OUT INOUT UNIFORM VARYING
@ -101,7 +101,7 @@
/* Reserved words that are not actually used in the grammar.
*/
%token ASM CLASS UNION ENUM TYPEDEF TEMPLATE THIS PACKED GOTO
%token INLINE NOINLINE VOLATILE PUBLIC STATIC EXTERN EXTERNAL
%token INLINE_TOK NOINLINE VOLATILE PUBLIC_TOK STATIC EXTERN EXTERNAL
%token LONG SHORT DOUBLE HALF FIXED UNSIGNED INPUT OUPTUT
%token HVEC2 HVEC3 HVEC4 DVEC2 DVEC3 DVEC4 FVEC2 FVEC3 FVEC4
%token SAMPLER2DRECT SAMPLER3DRECT SAMPLER2DRECTSHADOW
@ -942,7 +942,7 @@ interpolation_qualifier:
;
parameter_type_qualifier:
CONST { $$.i = 0; $$.q.constant = 1; }
CONST_TOK { $$.i = 0; $$.q.constant = 1; }
;
type_qualifier:
@ -959,7 +959,7 @@ type_qualifier:
;
storage_qualifier:
CONST { $$.i = 0; $$.q.constant = 1; }
CONST_TOK { $$.i = 0; $$.q.constant = 1; }
| ATTRIBUTE { $$.i = 0; $$.q.attribute = 1; }
| VARYING { $$.i = 0; $$.q.varying = 1; }
| CENTROID VARYING { $$.i = 0; $$.q.centroid = 1; $$.q.varying = 1; }