Mesa (master): glsl: Fix lexer rule for ^=

Ian Romanick idr at kemper.freedesktop.org
Tue Oct 19 20:19:46 UTC 2010


Module: Mesa
Branch: master
Commit: cba9062d584c2359ce3cd5e0e9c57e5d6b67509e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cba9062d584c2359ce3cd5e0e9c57e5d6b67509e

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.

---

 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 c0778a6..f690c47 100644
--- a/src/glsl/glsl_lexer.lpp
+++ b/src/glsl/glsl_lexer.lpp
@@ -250,7 +250,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