Mesa (7.9): glsl: Fix lexer rule for ^=
Ian Romanick
idr at kemper.freedesktop.org
Tue Dec 14 21:13:04 UTC 2010
Module: Mesa
Branch: 7.9
Commit: 1c15fb4414ea7db0621aa457448b5a958254aa29
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1c15fb4414ea7db0621aa457448b5a958254aa29
Author: Chad Versace <chad.versace at intel.com>
Date: Fri Oct 15 14:44:28 2010 -0700
glsl: Fix lexer rule for ^=
The caret is a special character, and needs to be quoted or escaped.
(cherry picked from commit cba9062d584c2359ce3cd5e0e9c57e5d6b67509e)
---
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 ed3cb25..fdf9604 100644
--- a/src/glsl/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
@@ -243,7 +243,7 @@ layout {
\<\<= return LEFT_ASSIGN;
>>= return RIGHT_ASSIGN;
&= return AND_ASSIGN;
-^= return XOR_ASSIGN;
+"^=" return XOR_ASSIGN;
\|= return OR_ASSIGN;
-= return SUB_ASSIGN;
More information about the mesa-commit
mailing list