diff options
| author | Eric Anholt <eric@anholt.net> | 2010-07-19 11:52:54 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-07-19 11:58:03 -0700 |
| commit | 5304493c40c5f450568fb518cb09940a72c1bc1d (patch) | |
| tree | 344f4fd2d65ebe8c86260628e7003ef5f5265abb /src/glsl/glsl_lexer.lpp | |
| parent | 82d4b9593bd541b20771cddc1365add21dea6ba9 (diff) | |
glsl2: Fix lexing of octal values, including "0".
When faced with a constructor like 'ivec4(0, 2, 0, 0)', we would
manage to get a value of 2 instead of 0 for the first "0". Usually 2
characters past "0" would point at some junk and lex as 0 anyway.
Fixes glsl-octal and glsl-unused-varyings.
Diffstat (limited to 'src/glsl/glsl_lexer.lpp')
| -rw-r--r-- | src/glsl/glsl_lexer.lpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp index 6c1000876e..b0afc44d5e 100644 --- a/src/glsl/glsl_lexer.lpp +++ b/src/glsl/glsl_lexer.lpp @@ -231,7 +231,7 @@ void return VOID; return INTCONSTANT; } 0[0-7]* { - yylval->n = strtol(yytext + 2, NULL, 8); + yylval->n = strtol(yytext, NULL, 8); return INTCONSTANT; } |