X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=e7a5c155e851e2ef179ebc59ef8324ec8b0580c8;hp=9705c989370d87b6672c7fc543a8fc9710c46502;hb=d3ceb2186dc79130508093b3d0c944771a53534f;hpb=47286086863b6009192ffdb3d3471c83211ee943

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index 9705c989..e7a5c155 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -6,6 +6,56 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+const Operator Operator::operators[] =
+{
+	{ "[", 2, BINARY, LEFT_TO_RIGHT },
+	{ "(", 2, BINARY, 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, LEFT_TO_RIGHT },
+	{ "/", 4, BINARY, LEFT_TO_RIGHT },
+	{ "%", 4, BINARY, LEFT_TO_RIGHT },
+	{ "+", 5, BINARY, LEFT_TO_RIGHT },
+	{ "-", 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, 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 },
+	{ "?", 15, BINARY, RIGHT_TO_LEFT },
+	{ ":", 15, 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 },
+	{ "|=", 16, BINARY, RIGHT_TO_LEFT },
+	{ ",", 17, BINARY, LEFT_TO_RIGHT },
+	{ { 0 }, 18, NO_OPERATOR, LEFT_TO_RIGHT }
+};
+
+
 template<typename C>
 NodeContainer<C>::NodeContainer(const NodeContainer &c):
 	C(c)