diff options
| author | Kenneth Graunke <[email protected]> | 2010-07-07 11:40:51 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2010-07-07 12:41:26 -0700 |
| commit | 388ab9fa6b468d8c162dd4fc645d2f758c49051c (patch) | |
| tree | 0c7bc5ee94cbc56e0493ef3e7e1e8a1661e7bccd | |
| parent | e78e0fa42b49b50ed1150f7fdb74bf942ebd6bcf (diff) | |
glsl2: Initialize yylineno and yycolumn so line numbers are sane.
| -rw-r--r-- | src/glsl/glcpp/glcpp-lex.l | 1 | ||||
| -rw-r--r-- | src/glsl/glsl_lexer.lpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/glsl/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l index 6a91b09954a..53e85556c16 100644 --- a/src/glsl/glcpp/glcpp-lex.l +++ b/src/glsl/glcpp/glcpp-lex.l @@ -36,6 +36,7 @@ yylloc->first_line = yylineno; \ yycolumn += yyleng; \ } while(0); +#define YY_USER_INIT yylineno = 0; yycolumn = 0; %} %option bison-bridge bison-locations reentrant noyywrap diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp index ddaa19db722..6c1000876e1 100644 --- a/src/glsl/glsl_lexer.lpp +++ b/src/glsl/glsl_lexer.lpp @@ -34,6 +34,8 @@ yycolumn += yyleng; \ } while(0); +#define YY_USER_INIT yylineno = 0; yycolumn = 0; + %} %option bison-bridge bison-locations reentrant noyywrap |