X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=0bff354a50571128a0fa31bed3dbe8c935a0b1dc;hp=76e9eef352f83f67a46c6b8a620d0411c0bf0440;hb=6e528ad728ed93f2016bc9f4204a9d906576300e;hpb=7189f63c549e9061789c47726ff8d6d12afca1a0

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 76e9eef3..0bff354a 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -29,12 +29,12 @@ private:
 	struct BlockModifier: Visitor
 	{
 		bool remove_node;
-		std::vector<RefPtr<ProgramSyntax::Node> > insert_nodes;
+		std::vector<RefPtr<ProgramSyntax::Statement> > insert_nodes;
 
 		BlockModifier();
 
 		void flatten_block(ProgramSyntax::Block &);
-		void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+		void apply_and_increment(ProgramSyntax::Block &, ProgramSyntax::NodeList<ProgramSyntax::Statement>::iterator &);
 		using Visitor::visit;
 		virtual void visit(ProgramSyntax::Block &);
 	};
@@ -44,9 +44,10 @@ private:
 		typedef std::string ResultType;
 
 		std::string formatted;
+		unsigned source_index;
+		unsigned source_line;
 		unsigned indent;
 		bool parameter_list;
-		unsigned else_if;
 		std::string block_interface;
 
 		Formatter();
@@ -54,6 +55,9 @@ private:
 		virtual void apply(ProgramSyntax::Stage &);
 		const std::string &get_result() const { return formatted; }
 		using Visitor::visit;
+		void append(const std::string &);
+		void append(char);
+		void set_source(unsigned, unsigned);
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::Literal &);
 		virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -152,7 +156,7 @@ private:
 		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 *);
+		ProgramSyntax::ExpressionStatement &insert_assignment(const std::string &, ProgramSyntax::Expression *);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::Passthrough &);
@@ -377,7 +381,7 @@ private:
 
 	Resources *resources;
 	ProgramSyntax::Module *module;
-	std::set<std::string> imported_names;
+	std::vector<std::string> imported_names;
 
 public:
 	ProgramCompiler();