~thopiekar/emgd/mesa-9.1

« back to all changes in this revision

Viewing changes to src/glsl/glsl_parser.yy

  • 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:
31
31
#include "glsl_types.h"
32
32
#include "main/context.h"
33
33
 
34
 
#define YYLEX_PARAM state->scanner
35
 
 
36
34
#undef yyerror
37
35
 
38
36
static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
39
37
{
40
38
   _mesa_glsl_error(loc, st, "%s", msg);
41
39
}
 
40
 
 
41
static int
 
42
_mesa_glsl_lex(YYSTYPE *val, YYLTYPE *loc, _mesa_glsl_parse_state *state)
 
43
{
 
44
   return _mesa_glsl_lexer_lex(val, loc, state->scanner);
 
45
}
42
46
%}
43
47
 
 
48
%expect 0
 
49
 
44
50
%pure-parser
45
51
%error-verbose
46
52
 
53
59
   @$.source = 0;
54
60
}
55
61
 
56
 
%lex-param   {void *scanner}
 
62
%lex-param   {struct _mesa_glsl_parse_state *state}
57
63
%parse-param {struct _mesa_glsl_parse_state *state}
58
64
 
59
65
%union {