X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=14e5d8e786cb679e36c448cf5ca68b1dfe387fd3;hb=3b159edbe4e80a2bc19c4c2fcd42cb996b9fbfe0;hp=2f9f1fc08a50f47eb3a8fc6f4757217cb39f0b09;hpb=74bd3813b9744550c9ac5980588e561835b616d9;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index 2f9f1fc0..14e5d8e7 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -5,6 +5,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <msp/core/refptr.h>
 #include "extension.h"
 
 namespace Msp {
@@ -25,39 +26,43 @@ public:
 };
 
 template<typename T>
-class NodePtr
+class NodePtr: public RefPtr<T>
 {
-private:
-	T *node;
-
 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; }
+	NodePtr() { }
+	NodePtr(T *p): RefPtr<T>(p) { }
+	NodePtr(const NodePtr &p): RefPtr<T>(p ? p->clone() : 0) { }
 
-private:
-	static T *clone(T *n) { return n ? n->clone() : 0; }
+	template<typename U>
+	NodePtr(const RefPtr<U> &p): RefPtr<T>(p) { }
 
+	template<typename U>
+	NodePtr(const NodePtr<U> &p): RefPtr<T>(p ? p->clone() : 0) { }
+};
+
+template<typename C>
+class NodeContainer: public C
+{
 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; }
+	NodeContainer() { }
+	NodeContainer(const NodeContainer &);
 };
 
+template<typename T>
+class NodeList: public NodeContainer<std::list<RefPtr<T> > >
+{ };
+
+template<typename T>
+class NodeArray: public NodeContainer<std::vector<RefPtr<T> > >
+{ };
+
 struct StructDeclaration;
 struct VariableDeclaration;
 struct FunctionDeclaration;
 
 struct Block: Node
 {
-	std::list<NodePtr<Node> > body;
+	NodeList<Node> body;
 	bool use_braces;
 	std::map<std::string, StructDeclaration *> types;
 	std::map<std::string, VariableDeclaration *> variables;
@@ -149,7 +154,7 @@ struct FunctionCall: Expression
 	std::string name;
 	FunctionDeclaration *declaration;
 	bool constructor;
-	std::vector<NodePtr<Expression> > arguments;
+	NodeArray<Expression> arguments;
 
 	FunctionCall();
 
@@ -182,12 +187,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;
@@ -211,6 +224,7 @@ struct VariableDeclaration: Node
 	NodePtr<Expression> array_size;
 	NodePtr<Expression> init_expression;
 	VariableDeclaration *linked_declaration;
+	NodePtr<Layout> layout;
 
 	VariableDeclaration();
 
@@ -236,7 +250,7 @@ struct FunctionDeclaration: Node
 {
 	std::string return_type;
 	std::string name;
-	std::vector<NodePtr<VariableDeclaration> > parameters;
+	NodeArray<VariableDeclaration> parameters;
 	FunctionDeclaration *definition;
 	Block body;
 
@@ -300,6 +314,7 @@ struct NodeVisitor
 	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 &) { }
@@ -319,6 +334,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 &);
@@ -344,6 +360,7 @@ 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);