X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=2f9f1fc08a50f47eb3a8fc6f4757217cb39f0b09;hb=74bd3813b9744550c9ac5980588e561835b616d9;hp=99ce8b9c1c47ebd20c202042d35218e67cfe17a8;hpb=73ce62f3b9c2bbfc1e655a9df343389a733dc795;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 99ce8b9c..2f9f1fc0 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -1,9 +1,11 @@
 #ifndef MSP_GL_PROGRAMSYNTAX_H_
 #define MSP_GL_PROGRAMSYNTAX_H_
 
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
+#include "extension.h"
 
 namespace Msp {
 namespace GL {
@@ -32,6 +34,10 @@ public:
 	NodePtr(T *n = 0): node(n) { }
 	NodePtr(const NodePtr &p): node(clone(p.node)) { }
 	NodePtr &operator=(const NodePtr &p) { delete node; node = clone(p.node); return *this; }
+#if __cplusplus>=201103L
+	NodePtr(NodePtr &&p): node(p.node) { p.node = 0; }
+	NodePtr &operator=(NodePtr &&p) { delete node; node = p.node; p.node = 0; return *this; }
+#endif
 	~NodePtr() { delete node; }
 
 private:
@@ -40,15 +46,21 @@ private:
 public:
 	T *operator->() { return node; }
 	const T *operator->() const { return node; }
+	T &operator*() { return *node; }
+	const T &operator*() const { return *node; }
 	operator void *() const { return node; }
 };
 
+struct StructDeclaration;
 struct VariableDeclaration;
+struct FunctionDeclaration;
 
 struct Block: Node
 {
-	std::vector<NodePtr<Node> > body;
+	std::list<NodePtr<Node> > body;
 	bool use_braces;
+	std::map<std::string, StructDeclaration *> types;
+	std::map<std::string, VariableDeclaration *> variables;
 
 	Block();
 
@@ -80,6 +92,9 @@ struct ParenthesizedExpression: Expression
 struct VariableReference: Expression
 {
 	std::string name;
+	VariableDeclaration *declaration;
+
+	VariableReference();
 
 	virtual VariableReference *clone() const { return new VariableReference(*this); }
 	virtual void visit(NodeVisitor &);
@@ -89,6 +104,7 @@ struct MemberAccess: Expression
 {
 	NodePtr<Expression> left;
 	std::string member;
+	VariableDeclaration *declaration;
 
 	virtual MemberAccess *clone() const { return new MemberAccess(*this); }
 	virtual void visit(NodeVisitor &);
@@ -112,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;
 
@@ -140,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
@@ -172,10 +205,12 @@ struct VariableDeclaration: Node
 	std::string sampling;
 	std::string interface;
 	std::string type;
+	StructDeclaration *type_declaration;
 	std::string name;
 	bool array;
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
+	VariableDeclaration *linked_declaration;
 
 	VariableDeclaration();
 
@@ -188,6 +223,8 @@ struct InterfaceBlock: Node
 	std::string interface;
 	std::string name;
 	Block members;
+	std::string instance_name;
+	bool array;
 
 	InterfaceBlock();
 
@@ -200,10 +237,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 &);
@@ -211,7 +249,7 @@ struct FunctionDeclaration: Node
 
 struct Conditional: Node
 {
-	Expression *condition;
+	NodePtr<Expression> condition;
 	Block body;
 	Block else_body;
 
@@ -230,6 +268,14 @@ struct Iteration: Node
 	virtual void visit(NodeVisitor &);
 };
 
+struct Passthrough: Node
+{
+	NodePtr<Expression> subscript;
+
+	virtual Passthrough *clone() const { return new Passthrough(*this); }
+	virtual void visit(NodeVisitor &);
+};
+
 struct Return: Node
 {
 	NodePtr<Expression> expression;
@@ -249,8 +295,10 @@ 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(StructDeclaration &) { }
 	virtual void visit(VariableDeclaration &) { }
@@ -258,33 +306,53 @@ struct NodeVisitor
 	virtual void visit(FunctionDeclaration &) { }
 	virtual void visit(Conditional &) { }
 	virtual void visit(Iteration &) { }
+	virtual void visit(Passthrough &) { }
 	virtual void visit(Return &) { }
 };
 
-enum ContextType
+struct TraversingVisitor: NodeVisitor
+{
+	virtual void visit(Block &);
+	virtual void visit(ParenthesizedExpression &);
+	virtual void visit(MemberAccess &);
+	virtual void visit(UnaryExpression &);
+	virtual void visit(BinaryExpression &);
+	virtual void visit(FunctionCall &);
+	virtual void visit(ExpressionStatement &);
+	virtual void visit(StructDeclaration &);
+	virtual void visit(VariableDeclaration &);
+	virtual void visit(InterfaceBlock &);
+	virtual void visit(FunctionDeclaration &);
+	virtual void visit(Conditional &);
+	virtual void visit(Iteration &);
+	virtual void visit(Passthrough &);
+	virtual void visit(Return &);
+};
+
+enum StageType
 {
-	GLOBAL,
+	SHARED,
 	VERTEX,
 	GEOMETRY,
 	FRAGMENT
 };
 
-struct Context
+struct Stage
 {
-	ContextType type;
-	bool present;
+	StageType type;
+	Stage *previous;
 	ProgramSyntax::Block content;
+	std::map<std::string, VariableDeclaration *> in_variables;
+	std::map<std::string, VariableDeclaration *> out_variables;
+	Version required_version;
 
-	Context(ContextType);
+	Stage(StageType);
 };
 
 struct Module
 {
-	Context global_context;
-	Context vertex_context;
-	Context geometry_context;
-	Context fragment_context;
-	std::map<std::string, StructDeclaration *> structs;
+	Stage shared;
+	std::list<Stage> stages;
 
 	Module();
 };