X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=c502ba47a90f32701bc885e44006ff48a8d93c24;hb=48e37a09b49cd4148db390170cfd07eef92c9d02;hp=cbce078e2d65c1eb74bb9985fa2639c4bc525326;hpb=7cd066816f7faab6f8f0eba1fca4dee67ee5dc3b;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index cbce078e..c502ba47 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "extension.h"
 
 namespace Msp {
 namespace GL {
@@ -52,6 +53,7 @@ public:
 
 struct StructDeclaration;
 struct VariableDeclaration;
+struct FunctionDeclaration;
 
 struct Block: Node
 {
@@ -126,17 +128,26 @@ struct BinaryExpression: Expression
 	std::string oper;
 	NodePtr<Expression> right;
 	std::string after;
-	bool assignment;
-
-	BinaryExpression();
 
 	virtual BinaryExpression *clone() const { return new BinaryExpression(*this); }
 	virtual void visit(NodeVisitor &);
 };
 
+struct Assignment: BinaryExpression
+{
+	bool self_referencing;
+	VariableDeclaration *target_declaration;
+
+	Assignment();
+
+	virtual Assignment *clone() const { return new Assignment(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct FunctionCall: Expression
 {
 	std::string name;
+	FunctionDeclaration *declaration;
 	bool constructor;
 	std::vector<NodePtr<Expression> > arguments;
 
@@ -154,6 +165,14 @@ struct ExpressionStatement: Node
 	virtual void visit(NodeVisitor &);
 };
 
+struct Import: Node
+{
+	std::string module;
+
+	virtual Import *clone() const { return new Import(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct Layout: Node
 {
 	struct Qualifier
@@ -163,12 +182,20 @@ struct Layout: Node
 	};
 
 	std::vector<Qualifier> qualifiers;
-	std::string interface;
 
 	virtual Layout *clone() const { return new Layout(*this); }
 	virtual void visit(NodeVisitor &);
 };
 
+struct InterfaceLayout: Node
+{
+	std::string interface;
+	Layout layout;
+
+	virtual InterfaceLayout *clone() const { return new InterfaceLayout(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct StructDeclaration: Node
 {
 	std::string name;
@@ -192,6 +219,7 @@ struct VariableDeclaration: Node
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
 	VariableDeclaration *linked_declaration;
+	NodePtr<Layout> layout;
 
 	VariableDeclaration();
 
@@ -204,6 +232,8 @@ struct InterfaceBlock: Node
 	std::string interface;
 	std::string name;
 	Block members;
+	std::string instance_name;
+	bool array;
 
 	InterfaceBlock();
 
@@ -216,10 +246,11 @@ struct FunctionDeclaration: Node
 	std::string return_type;
 	std::string name;
 	std::vector<NodePtr<VariableDeclaration> > parameters;
-	bool definition;
+	FunctionDeclaration *definition;
 	Block body;
 
 	FunctionDeclaration();
+	FunctionDeclaration(const FunctionDeclaration &);
 
 	virtual FunctionDeclaration *clone() const { return new FunctionDeclaration(*this); }
 	virtual void visit(NodeVisitor &);
@@ -273,9 +304,12 @@ struct NodeVisitor
 	virtual void visit(MemberAccess &) { }
 	virtual void visit(UnaryExpression &) { }
 	virtual void visit(BinaryExpression &) { }
+	virtual void visit(Assignment &);
 	virtual void visit(FunctionCall &) { }
 	virtual void visit(ExpressionStatement &) { }
+	virtual void visit(Import &) { }
 	virtual void visit(Layout &) { }
+	virtual void visit(InterfaceLayout &) { }
 	virtual void visit(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
 	virtual void visit(InterfaceBlock &) { }
@@ -295,6 +329,7 @@ struct TraversingVisitor: NodeVisitor
 	virtual void visit(BinaryExpression &);
 	virtual void visit(FunctionCall &);
 	virtual void visit(ExpressionStatement &);
+	virtual void visit(InterfaceLayout &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
 	virtual void visit(InterfaceBlock &);
@@ -320,6 +355,8 @@ struct Stage
 	ProgramSyntax::Block content;
 	std::map<std::string, VariableDeclaration *> in_variables;
 	std::map<std::string, VariableDeclaration *> out_variables;
+	std::map<std::string, unsigned> locations;
+	Version required_version;
 
 	Stage(StageType);
 };