X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=39bc8264e1b8d30ead80ad19ad78f9232a6cd3ae;hb=a1ba04add302e7712d127b46d8d11386987a0aea;hp=0379a91146c17c3cbb02680717bea4036bcfb83b;hpb=d80750e7c20ea061f210b756196cc844b762b852;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 0379a911..39bc8264 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -6,7 +6,9 @@
 #include <set>
 #include <string>
 #include <vector>
+#include <msp/core/inttypes.h>
 #include <msp/core/refptr.h>
+#include <msp/core/variant.h>
 #include "features.h"
 #include "glsl_error.h"
 #include "sourcemap.h"
@@ -47,6 +49,7 @@ struct Operator
 
 enum
 {
+	INTERNAL_SOURCE = -2,
 	BUILTIN_SOURCE = -1,
 	GENERATED_SOURCE = 0
 };
@@ -101,7 +104,7 @@ template<typename T>
 class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 { };
 
-struct StructDeclaration;
+struct TypeDeclaration;
 struct VariableDeclaration;
 struct InterfaceBlock;
 struct FunctionDeclaration;
@@ -130,6 +133,9 @@ struct Expression: Node
 {
 	const Operator *oper;
 
+	TypeDeclaration *type;
+	bool lvalue;
+
 	Expression();
 
 	virtual Expression *clone() const = 0;
@@ -138,6 +144,7 @@ struct Expression: Node
 struct Literal: Expression
 {
 	std::string token;
+	Variant value;
 
 	virtual Literal *clone() const { return new Literal(*this); }
 	virtual void visit(NodeVisitor &);
@@ -191,6 +198,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;
@@ -210,9 +230,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 &);
@@ -347,7 +385,11 @@ struct StructDeclaration: TypeDeclaration
 {
 	Block members;
 
+	InterfaceBlock *interface_block;
+
 	StructDeclaration();
+	StructDeclaration(const StructDeclaration &);
+	~StructDeclaration();
 
 	virtual StructDeclaration *clone() const { return new StructDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -382,10 +424,14 @@ struct InterfaceBlock: Statement
 {
 	std::string interface;
 	std::string name;
-	Block members;
+	NodePtr<Block> members;
 	std::string instance_name;
 	bool array;
 
+	/* An interface block's ultimate base type is always a struct.  The
+	immediate type may be either that same struct or an array of it. */
+	TypeDeclaration *type_declaration;
+	StructDeclaration *struct_declaration;
 	InterfaceBlock *linked_block;
 
 	InterfaceBlock();
@@ -403,6 +449,7 @@ struct FunctionDeclaration: Statement
 	NodeArray<VariableDeclaration> parameters;
 	Block body;
 
+	std::string signature;
 	FunctionDeclaration *definition;
 	TypeDeclaration *return_type_declaration;