X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=6bac5386828d928ba2d9379366d48b8efb9ae020;hb=009918a51aa309eeceb6c02ecaebe45e8d357033;hp=0ea485a9765d2faa7cafca338b622c5955b936da;hpb=a36992487d018d8801ead6980b362b00a2f5f5c5;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 0ea485a9..6bac5386 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -59,17 +59,56 @@ private:
 		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
+	struct InterfaceGenerator: ProgramSyntax::TraversingVisitor
+	{
+		ProgramSyntax::Context *context;
+		std::string in_prefix;
+		std::string out_prefix;
+		unsigned scope_level;
+		std::map<std::string, ProgramSyntax::NodePtr<ProgramSyntax::Node> > iface_declarations;
+		bool remove_node;
+		std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> > insert_nodes;
+
+		InterfaceGenerator();
+
+		static std::string get_out_prefix(ProgramSyntax::ContextType);
+		void visit(ProgramSyntax::Context &);
+		virtual void visit(ProgramSyntax::Block &);
+		std::string change_prefix(const std::string &, const std::string &) const;
+		bool generate_interface(ProgramSyntax::VariableDeclaration &, const std::string &, const std::string &);
+		void insert_assignment(const std::string &, ProgramSyntax::Expression *);
+		virtual void visit(ProgramSyntax::VariableReference &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+		virtual void visit(ProgramSyntax::Passthrough &);
+	};
+
+	struct VariableRenamer: ProgramSyntax::TraversingVisitor
+	{
+		virtual void visit(ProgramSyntax::VariableReference &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+	};
+
 	struct UnusedVariableLocator: ProgramSyntax::TraversingVisitor
 	{
-		std::set<ProgramSyntax::VariableDeclaration *> unused_variables;
+		ProgramSyntax::Context *context;
+		std::set<ProgramSyntax::Node *> unused_nodes;
+		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> assignments;
+		bool assignment;
+		ProgramSyntax::VariableDeclaration *assignment_target;
+
+		UnusedVariableLocator();
 
+		void visit(ProgramSyntax::Context &);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::MemberAccess &);
+		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
 	struct NodeRemover: ProgramSyntax::TraversingVisitor
 	{
+		ProgramSyntax::Context *context;
 		std::set<ProgramSyntax::Node *> to_remove;
 		unsigned n_removed;
 		bool immutable_block;
@@ -77,8 +116,10 @@ private:
 
 		NodeRemover();
 
+		void visit(ProgramSyntax::Context &);
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::InterfaceBlock &);
 	};
 
@@ -94,8 +135,10 @@ public:
 
 private:
 	void process();
-	void process(ProgramSyntax::Context &);
+	void generate(ProgramSyntax::Context &);
+	void optimize(ProgramSyntax::Context &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);
+	static void resolve_variables(ProgramSyntax::Context &);
 	std::string format_context(ProgramSyntax::Context &);
 };