X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=b74f482aa8df5a21dfffebc23c2f2b6fb8a8dd21;hb=2b74d276f67d07e37b56aeebc474a58ceeea3e68;hp=c60b33bf5bad26b86d2b0abc53b7ba442b451ce2;hpb=b7702a7162bba41718dd56b875e5d911f5ab3edb;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index c60b33bf..b74f482a 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -21,10 +21,10 @@ const Operator Operator::operators[] =
 	{ "-", 3, PREFIX, RIGHT_TO_LEFT },
 	{ "~", 3, PREFIX, RIGHT_TO_LEFT },
 	{ "!", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "*", 4, BINARY, LEFT_TO_RIGHT },
+	{ "*", 4, BINARY, ASSOCIATIVE },
 	{ "/", 4, BINARY, LEFT_TO_RIGHT },
 	{ "%", 4, BINARY, LEFT_TO_RIGHT },
-	{ "+", 5, BINARY, LEFT_TO_RIGHT },
+	{ "+", 5, BINARY, ASSOCIATIVE },
 	{ "-", 5, BINARY, LEFT_TO_RIGHT },
 	{ "<<", 6, BINARY, LEFT_TO_RIGHT },
 	{ ">>", 6, BINARY, LEFT_TO_RIGHT },
@@ -34,12 +34,12 @@ const Operator Operator::operators[] =
 	{ ">=", 7, BINARY, LEFT_TO_RIGHT },
 	{ "==", 8, BINARY, LEFT_TO_RIGHT },
 	{ "!=", 8, BINARY, LEFT_TO_RIGHT },
-	{ "&", 9, BINARY, LEFT_TO_RIGHT },
-	{ "^", 10, BINARY, LEFT_TO_RIGHT },
-	{ "|", 11, BINARY, LEFT_TO_RIGHT },
-	{ "&&", 12, BINARY, LEFT_TO_RIGHT },
-	{ "^^", 13, BINARY, LEFT_TO_RIGHT },
-	{ "||", 14, BINARY, LEFT_TO_RIGHT },
+	{ "&", 9, BINARY, ASSOCIATIVE },
+	{ "^", 10, BINARY, ASSOCIATIVE },
+	{ "|", 11, BINARY, ASSOCIATIVE },
+	{ "&&", 12, BINARY, ASSOCIATIVE },
+	{ "^^", 13, BINARY, ASSOCIATIVE },
+	{ "||", 14, BINARY, ASSOCIATIVE },
 	{ "?", 15, BINARY, RIGHT_TO_LEFT },
 	{ ":", 15, BINARY, RIGHT_TO_LEFT },
 	{ "=", 16, BINARY, RIGHT_TO_LEFT },