From: Eric Anholt <eric@anholt.net>
Date: Mon, 19 Jul 2010 18:52:54 +0000 (-0700)
Subject: glsl2: Fix lexing of octal values, including "0".
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5304493c40c5f450568fb518cb09940a72c1bc1d;p=mesa.git

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.
---

diff --git a/src/glsl/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
index 6c1000876e1..b0afc44d5e9 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;
 			}