Mesa (master): glsl: Fix copy and paste error in ast_bit_and node creation.

[Kenneth Graunke]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Oct 18 17:25:52 2010 -0700

glsl: Fix copy and paste error in ast_bit_and node creation.

All & operations were incorrectly being generated as ast_bit_or.

---

 src/glsl/glsl_parser.ypp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index ed18179..3813d7a 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -561,7 +561,7 @@ and_expression:
 	| and_expression '&' equality_expression
 	{
 	   void *ctx = state;
-	   $$ = new(ctx) ast_expression_bin(ast_bit_or, $1, $3);
+	   $$ = new(ctx) ast_expression_bin(ast_bit_and, $1, $3);
 	   $$->set_location(yylloc);
 	}
 	;