X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=9a0cc6ea3f4bc8c867a2d381494b816b937495eb;hp=c502ba47a90f32701bc885e44006ff48a8d93c24;hb=57c1139e4fe21aeca7118b18eb3ba6fa43d7bf90;hpb=1a561b4e8d77fd14711b2304152e0b2408a49fdf

diff --git a/source/programsyntax.h b/source/programsyntax.h
index c502ba47..9a0cc6ea 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 {
@@ -24,40 +25,13 @@ public:
 	virtual void visit(NodeVisitor &) = 0;
 };
 
-template<typename T>
-class NodePtr
-{
-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; }
-
-private:
-	static T *clone(T *n) { return n ? n->clone() : 0; }
-
-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::list<NodePtr<Node> > body;
+	std::list<RefPtr<Node> > body;
 	bool use_braces;
 	std::map<std::string, StructDeclaration *> types;
 	std::map<std::string, VariableDeclaration *> variables;
@@ -83,7 +57,7 @@ struct Literal: Expression
 
 struct ParenthesizedExpression: Expression
 {
-	NodePtr<Expression> expression;
+	RefPtr<Expression> expression;
 
 	virtual ParenthesizedExpression *clone() const { return new ParenthesizedExpression(*this); }
 	virtual void visit(NodeVisitor &);
@@ -102,7 +76,7 @@ struct VariableReference: Expression
 
 struct MemberAccess: Expression
 {
-	NodePtr<Expression> left;
+	RefPtr<Expression> left;
 	std::string member;
 	VariableDeclaration *declaration;
 
@@ -113,7 +87,7 @@ struct MemberAccess: Expression
 struct UnaryExpression: Expression
 {
 	std::string oper;
-	NodePtr<Expression> expression;
+	RefPtr<Expression> expression;
 	bool prefix;
 
 	UnaryExpression();
@@ -124,9 +98,9 @@ struct UnaryExpression: Expression
 
 struct BinaryExpression: Expression
 {
-	NodePtr<Expression> left;
+	RefPtr<Expression> left;
 	std::string oper;
-	NodePtr<Expression> right;
+	RefPtr<Expression> right;
 	std::string after;
 
 	virtual BinaryExpression *clone() const { return new BinaryExpression(*this); }
@@ -149,7 +123,7 @@ struct FunctionCall: Expression
 	std::string name;
 	FunctionDeclaration *declaration;
 	bool constructor;
-	std::vector<NodePtr<Expression> > arguments;
+	std::vector<RefPtr<Expression> > arguments;
 
 	FunctionCall();
 
@@ -159,7 +133,7 @@ struct FunctionCall: Expression
 
 struct ExpressionStatement: Node
 {
-	NodePtr<Expression> expression;
+	RefPtr<Expression> expression;
 
 	virtual ExpressionStatement *clone() const { return new ExpressionStatement(*this); }
 	virtual void visit(NodeVisitor &);
@@ -216,10 +190,10 @@ struct VariableDeclaration: Node
 	StructDeclaration *type_declaration;
 	std::string name;
 	bool array;
-	NodePtr<Expression> array_size;
-	NodePtr<Expression> init_expression;
+	RefPtr<Expression> array_size;
+	RefPtr<Expression> init_expression;
 	VariableDeclaration *linked_declaration;
-	NodePtr<Layout> layout;
+	RefPtr<Layout> layout;
 
 	VariableDeclaration();
 
@@ -245,7 +219,7 @@ struct FunctionDeclaration: Node
 {
 	std::string return_type;
 	std::string name;
-	std::vector<NodePtr<VariableDeclaration> > parameters;
+	std::vector<RefPtr<VariableDeclaration> > parameters;
 	FunctionDeclaration *definition;
 	Block body;
 
@@ -258,7 +232,7 @@ struct FunctionDeclaration: Node
 
 struct Conditional: Node
 {
-	NodePtr<Expression> condition;
+	RefPtr<Expression> condition;
 	Block body;
 	Block else_body;
 
@@ -268,9 +242,9 @@ struct Conditional: Node
 
 struct Iteration: Node
 {
-	NodePtr<Node> init_statement;
-	NodePtr<Expression> condition;
-	NodePtr<Expression> loop_expression;
+	RefPtr<Node> init_statement;
+	RefPtr<Expression> condition;
+	RefPtr<Expression> loop_expression;
 	Block body;
 
 	virtual Iteration *clone() const { return new Iteration(*this); }
@@ -279,7 +253,7 @@ struct Iteration: Node
 
 struct Passthrough: Node
 {
-	NodePtr<Expression> subscript;
+	RefPtr<Expression> subscript;
 
 	virtual Passthrough *clone() const { return new Passthrough(*this); }
 	virtual void visit(NodeVisitor &);
@@ -287,7 +261,7 @@ struct Passthrough: Node
 
 struct Return: Node
 {
-	NodePtr<Expression> expression;
+	RefPtr<Expression> expression;
 
 	virtual Return *clone() const { return new Return(*this); }
 	virtual void visit(NodeVisitor &);