fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 16:18:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glcpp: Fix source numbers set with "#line LINE_NUMBER SOURCE_NUMBER"

Browse source 
Previously, the YY_USER_ACTION was overwriting the yylloc->source value
in every action, (after that value had been carefully set by the handling
of the #line directive). Instead, we want to initialize it once in
YY_USER_INIT and then not touch it at all in YY_USER_ACTION.
This commit is contained in:
Carl Worth 2010-08-23 09:29:49 -07:00
parent 2a9e791fde
commit ff10d239af
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/glsl/glcpp/glcpp-lex.l
View file

@ -38,12 +38,17 @@ void glcpp_set_column (int column_no , yyscan_t yyscanner);
#define YY_USER_ACTION \
do { \
yylloc->source = 0; \
yylloc->first_column = yycolumn + 1; \
yylloc->first_line = yylineno; \
yycolumn += yyleng; \
} while(0);
#define YY_USER_INIT yylineno = 1; yycolumn = 1;
#define YY_USER_INIT \
do { \
yylineno = 1; \
yycolumn = 1; \
yylloc->source = 0; \
} while(0)
%}
%option bison-bridge bison-locations reentrant noyywrap