← Back to branch summary

~thopiekar/emgd/mesa-9.1

« back to all changes in this revision

Viewing changes to src/mesa/program/program_parse.y

  • Committer: Thomas-Karl Pietrowski
  • Date: 2014-06-07 18:54:04 UTC
  • Revision ID: git-v1:7bd3ae82e2ad6c68cdc3d3913edbb7652bf033f9
Remaining changes to bison 3/2 compat problem
BUG: https://bugs.freedesktop.org/show_bug.cgi?id=67354

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/program/program_parse.y
113
113
            + (Current).first_column;                                   \
114
114
      }                                                                 \
115
115
   } while(0)
116
 
 
117
 
#define YYLEX_PARAM state->scanner
118
116
%}
119
117
 
120
118
%pure-parser
121
119
%locations
 
120
%lex-param   { struct asm_parser_state *state }
122
121
%parse-param { struct asm_parser_state *state }
123
122
%error-verbose
124
 
%lex-param { void *scanner }
125
123
 
126
124
%union {
127
125
   struct asm_instruction *inst;
269
267
%type <negate> optionalSign
270
268
 
271
269
%{
272
 
extern int yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
273
 
    void *yyscanner);
 
270
extern int
 
271
_mesa_program_lexer_lex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
 
272
                        void *yyscanner);
 
273
 
 
274
static int
 
275
yylex(YYSTYPE *yylval_param, YYLTYPE *yylloc_param,
 
276
      struct asm_parser_state *state)
 
277
{
 
278
   return _mesa_program_lexer_lex(yylval_param, yylloc_param, state->scanner);
 
279
}
274
280
%}
275
281
 
276
282
%%