X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=81fd6b4f6390050e0312aee3b2d04983e55217e4;hb=6dcf74922f46b086ad394c19fd6ce083a635b290;hp=30acca42b957bd42b547b642173032160fcdd0df;hpb=041ba4b1acd55337239c5ce24cc310118c621206;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 30acca42..81fd6b4f 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -6,6 +6,7 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <msp/core/inttypes.h>
 #include <msp/core/refptr.h>
 #include <msp/core/variant.h>
 #include "features.h"
@@ -26,7 +27,8 @@ struct Operator
 		NO_OPERATOR,
 		BINARY,
 		PREFIX,
-		POSTFIX
+		POSTFIX,
+		TERNARY
 	};
 
 	enum Associativity
@@ -197,6 +199,19 @@ struct MemberAccess: Expression
 	virtual void visit(NodeVisitor &);
 };
 
+struct Swizzle: Expression
+{
+	NodePtr<Expression> left;
+	std::string component_group;
+	unsigned count;
+	UInt8 components[4];
+
+	Swizzle();
+
+	virtual Swizzle *clone() const { return new Swizzle(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct UnaryExpression: Expression
 {
 	NodePtr<Expression> expression;
@@ -216,9 +231,27 @@ struct BinaryExpression: Expression
 
 struct Assignment: BinaryExpression
 {
+	struct Target
+	{
+		enum ChainType
+		{
+			MEMBER = 0x40,
+			SWIZZLE = 0x80,
+			ARRAY = 0xC0
+		};
+
+		Statement *declaration;
+		Msp::UInt8 chain_len;
+		Msp::UInt8 chain[7];
+
+		Target(Statement * = 0);
+
+		bool operator<(const Target &) const;
+	};
+
 	bool self_referencing;
 
-	VariableDeclaration *target_declaration;
+	Target target;
 
 	Assignment();
 	Assignment(const Assignment &);
@@ -227,6 +260,16 @@ struct Assignment: BinaryExpression
 	virtual void visit(NodeVisitor &);
 };
 
+struct TernaryExpression: Expression
+{
+	NodePtr<Expression> condition;
+	NodePtr<Expression> true_expr;
+	NodePtr<Expression> false_expr;
+
+	virtual TernaryExpression *clone() const { return new TernaryExpression(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct FunctionCall: Expression
 {
 	std::string name;
@@ -415,8 +458,11 @@ struct FunctionDeclaration: Statement
 	std::string return_type;
 	std::string name;
 	NodeArray<VariableDeclaration> parameters;
+	bool virtua;
+	bool overrd;
 	Block body;
 
+	std::string signature;
 	FunctionDeclaration *definition;
 	TypeDeclaration *return_type_declaration;