X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramsyntax.h;h=88f333ac1559d2e662dbaeca7903aecfbdbfa1ed;hb=a209ca32465c61b38f3a57ee6577568f3994e8ab;hp=c645a60a442ec91a616060f11c55327e9a34d4f6;hpb=a29cc14162e911b36d18d1d1896216697c7dc0c1;p=libs%2Fgl.git

diff --git a/source/programsyntax.h b/source/programsyntax.h
index c645a60a..88f333ac 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -33,6 +33,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:
@@ -200,6 +204,8 @@ struct InterfaceBlock: Node
 	std::string interface;
 	std::string name;
 	Block members;
+	std::string instance_name;
+	bool array;
 
 	InterfaceBlock();
 
@@ -223,7 +229,7 @@ struct FunctionDeclaration: Node
 
 struct Conditional: Node
 {
-	Expression *condition;
+	NodePtr<Expression> condition;
 	Block body;
 	Block else_body;