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

diff --git a/source/programsyntax.h b/source/programsyntax.h
index cbce078e..9545760c 100644
--- a/source/programsyntax.h
+++ b/source/programsyntax.h
@@ -126,14 +126,22 @@ 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;
@@ -154,6 +162,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
@@ -204,6 +220,8 @@ struct InterfaceBlock: Node
 	std::string interface;
 	std::string name;
 	Block members;
+	std::string instance_name;
+	bool array;
 
 	InterfaceBlock();
 
@@ -216,10 +234,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,8 +292,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 &) { }