X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=bbd364c0730d7cca157376ad34bbdbd028ec1581;hp=025af2710bb55da807fb686b6876eaef41d4ce22;hb=911c6c4acc8218bc40d93917207f9dc32e9f2596;hpb=ff3b43b6c15c3331d156b147b559892ee7ccdacb

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 025af271..bbd364c0 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -10,51 +10,50 @@ namespace SL {
 
 const Operator Operator::operators[] =
 {
-	{ "[", 2, BINARY, LEFT_TO_RIGHT },
-	{ "(", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ ".", 2, BINARY, LEFT_TO_RIGHT },
-	{ "++", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ "--", 2, POSTFIX, LEFT_TO_RIGHT },
-	{ "++", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "--", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "+", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "-", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "~", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "!", 3, PREFIX, RIGHT_TO_LEFT },
-	{ "*", 4, BINARY, ASSOCIATIVE },
-	{ "/", 4, BINARY, LEFT_TO_RIGHT },
-	{ "%", 4, BINARY, LEFT_TO_RIGHT },
-	{ "+", 5, BINARY, ASSOCIATIVE },
-	{ "-", 5, BINARY, LEFT_TO_RIGHT },
-	{ "<<", 6, BINARY, LEFT_TO_RIGHT },
-	{ ">>", 6, BINARY, LEFT_TO_RIGHT },
-	{ "<", 7, BINARY, LEFT_TO_RIGHT },
-	{ ">", 7, BINARY, LEFT_TO_RIGHT },
-	{ "<=", 7, BINARY, LEFT_TO_RIGHT },
-	{ ">=", 7, BINARY, LEFT_TO_RIGHT },
-	{ "==", 8, BINARY, LEFT_TO_RIGHT },
-	{ "!=", 8, BINARY, LEFT_TO_RIGHT },
-	{ "&", 9, BINARY, ASSOCIATIVE },
-	{ "^", 10, BINARY, ASSOCIATIVE },
-	{ "|", 11, BINARY, ASSOCIATIVE },
-	{ "&&", 12, BINARY, ASSOCIATIVE },
-	{ "^^", 13, BINARY, ASSOCIATIVE },
-	{ "||", 14, BINARY, ASSOCIATIVE },
-	{ "?", 15, TERNARY, RIGHT_TO_LEFT },
-	{ ":", 15, TERNARY, RIGHT_TO_LEFT },
-	{ "=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "+=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "-=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "*=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "/=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "%=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "<<=", 16, BINARY, RIGHT_TO_LEFT },
-	{ ">>=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "&=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "^=", 16, BINARY, RIGHT_TO_LEFT },
-	{ "|=", 16, BINARY, RIGHT_TO_LEFT },
-	{ ",", 17, BINARY, LEFT_TO_RIGHT },
-	{ { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
+	{ "[", "]", 2, BINARY, LEFT_TO_RIGHT },
+	{ "(", ")", 2, POSTFIX, LEFT_TO_RIGHT },
+	{ ".", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "++", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "--", { }, 2, POSTFIX, LEFT_TO_RIGHT },
+	{ "++", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "--", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "+", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "-", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "~", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "!", { }, 3, PREFIX, RIGHT_TO_LEFT },
+	{ "*", { }, 4, BINARY, ASSOCIATIVE },
+	{ "/", { }, 4, BINARY, LEFT_TO_RIGHT },
+	{ "%", { }, 4, BINARY, LEFT_TO_RIGHT },
+	{ "+", { }, 5, BINARY, ASSOCIATIVE },
+	{ "-", { }, 5, BINARY, LEFT_TO_RIGHT },
+	{ "<<", { }, 6, BINARY, LEFT_TO_RIGHT },
+	{ ">>", { }, 6, BINARY, LEFT_TO_RIGHT },
+	{ "<", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ ">", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ "<=", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ ">=", { }, 7, BINARY, LEFT_TO_RIGHT },
+	{ "==", { }, 8, BINARY, LEFT_TO_RIGHT },
+	{ "!=", { }, 8, BINARY, LEFT_TO_RIGHT },
+	{ "&", { }, 9, BINARY, ASSOCIATIVE },
+	{ "^", { }, 10, BINARY, ASSOCIATIVE },
+	{ "|", { }, 11, BINARY, ASSOCIATIVE },
+	{ "&&", { }, 12, BINARY, ASSOCIATIVE },
+	{ "^^", { }, 13, BINARY, ASSOCIATIVE },
+	{ "||", { }, 14, BINARY, ASSOCIATIVE },
+	{ "?", ":", 15, TERNARY, RIGHT_TO_LEFT },
+	{ "=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "+=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "-=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "*=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "/=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "%=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "<<=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ ">>=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "&=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "^=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ "|=", { }, 16, BINARY, RIGHT_TO_LEFT },
+	{ ",", { }, 17, BINARY, LEFT_TO_RIGHT },
+	{ { 0 }, { }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
 };
 
 const Operator &Operator::get_operator(const string &token, Type type)