X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=7e8d3373a53e4ffcf028a218d99e420d1a9cd5a7;hp=be2afab6fdd4d5746c5605aa8c1e9e1ea9707146;hb=bfeb6c6404659fffb1222e084b0bd08cccb4e67d;hpb=6fe1876a3040cc78ba4713194abf6d121f419458

diff --git a/source/programcompiler.h b/source/programcompiler.h
index be2afab6..7e8d3373 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -29,7 +29,7 @@ private:
 	struct BlockModifier: Visitor
 	{
 		bool remove_node;
-		std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+		std::vector<RefPtr<ProgramSyntax::Node> > insert_nodes;
 
 		BlockModifier();
 
@@ -81,9 +81,9 @@ private:
 	template<typename T>
 	struct NodeGatherer: Visitor
 	{
-		typedef std::list<T *> ResultType;
+		typedef std::vector<T *> ResultType;
 
-		std::list<T *> nodes;
+		std::vector<T *> nodes;
 
 		const ResultType &get_result() const { return nodes; }
 		using Visitor::visit;
@@ -169,17 +169,21 @@ private:
 			FUNCTION
 		};
 
+		unsigned scope_level;
 		DeclarationKind kind;
+		std::set<ProgramSyntax::Node *> ordered_funcs;
+		std::set<ProgramSyntax::Node *> needed_funcs;
 
 		DeclarationReorderer();
 
 		using Visitor::visit;
 		virtual void visit(ProgramSyntax::Block &);
+		virtual void visit(ProgramSyntax::FunctionCall &);
 		virtual void visit(ProgramSyntax::InterfaceLayout &) { kind = LAYOUT; }
 		virtual void visit(ProgramSyntax::StructDeclaration &) { kind = STRUCT; }
-		virtual void visit(ProgramSyntax::VariableDeclaration &) { kind = VARIABLE; }
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::InterfaceBlock &) { kind = VARIABLE; }
-		virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+		virtual void visit(ProgramSyntax::FunctionDeclaration &);
 	};
 
 	struct InlineableFunctionLocator: Visitor