X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=829f75358cdd08695d16730184f109cc03e5c0d6;hb=49717d5554becc07a4fafa4f1cbf85ac6ca13907;hp=34b64b557ca29a9185dc2f5e2aacaa1420bbf325;hpb=96881e56ececfa3f4b0707dc168c687b35d249a0;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 34b64b55..829f7535 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -98,9 +98,14 @@ private:
 	struct UnusedVariableLocator: Visitor
 	{
 		std::set<ProgramSyntax::Node *> unused_nodes;
+		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
+		ProgramSyntax::Node *aggregate;
 		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
 		bool assignment;
+		bool record_target;
 		ProgramSyntax::VariableDeclaration *assignment_target;
+		bool indeterminate_target;
+		bool self_referencing;
 
 		UnusedVariableLocator();
 
@@ -108,22 +113,17 @@ private:
 		virtual void visit(ProgramSyntax::MemberAccess &);
 		virtual void visit(ProgramSyntax::BinaryExpression &);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
+		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
+		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
 	struct NodeRemover: Visitor
 	{
 		std::set<ProgramSyntax::Node *> to_remove;
-		unsigned n_removed;
-		bool immutable_block;
-		bool remove_block;
-
-		NodeRemover();
 
 		virtual void visit(ProgramSyntax::Block &);
-		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
-		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
 	ProgramParser parser;