X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.h;h=2c832c149e2467ba346867eb453cc8850b7a11a6;hb=50ab5ca;hp=62c289d9fbb6ec48f61be268b7eec67072718e98;hpb=4c805f55d89919d6971d600102ab4d6d65d56dc3;p=libs%2Fgl.git

diff --git a/source/glsl/syntax.h b/source/glsl/syntax.h
index 62c289d9..2c832c14 100644
--- a/source/glsl/syntax.h
+++ b/source/glsl/syntax.h
@@ -7,6 +7,7 @@
 #include <string>
 #include <vector>
 #include <msp/core/refptr.h>
+#include <msp/core/variant.h>
 #include "features.h"
 #include "glsl_error.h"
 #include "sourcemap.h"
@@ -101,7 +102,7 @@ template<typename T>
 class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
 { };
 
-struct StructDeclaration;
+struct TypeDeclaration;
 struct VariableDeclaration;
 struct InterfaceBlock;
 struct FunctionDeclaration;
@@ -130,6 +131,9 @@ struct Expression: Node
 {
 	const Operator *oper;
 
+	TypeDeclaration *type;
+	bool lvalue;
+
 	Expression();
 
 	virtual Expression *clone() const = 0;
@@ -138,6 +142,7 @@ struct Expression: Node
 struct Literal: Expression
 {
 	std::string token;
+	Variant value;
 
 	virtual Literal *clone() const { return new Literal(*this); }
 	virtual void visit(NodeVisitor &);
@@ -404,6 +409,7 @@ struct FunctionDeclaration: Statement
 	Block body;
 
 	FunctionDeclaration *definition;
+	TypeDeclaration *return_type_declaration;
 
 	FunctionDeclaration();
 	FunctionDeclaration(const FunctionDeclaration &);