X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=9c20e090980fd3d403c4574345692314a1eeff71;hp=461fac9a2e649b1fb3f2597da5ebed6759b218ff;hb=be55468e10915d377634aa850a95dcfb9093216d;hpb=aa9873652630db493b5bd9faee4117e9c30ef226

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 461fac9a..9c20e090 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 &);
 	};
@@ -46,7 +46,6 @@ private:
 		std::string formatted;
 		unsigned indent;
 		bool parameter_list;
-		unsigned else_if;
 		std::string block_interface;
 
 		Formatter();
@@ -54,6 +53,8 @@ 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);
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::Literal &);
 		virtual void visit(ProgramSyntax::ParenthesizedExpression &);
@@ -218,6 +219,7 @@ private:
 		virtual void visit(ProgramSyntax::BinaryExpression &);
 		virtual void visit(ProgramSyntax::MemberAccess &);
 		virtual void visit(ProgramSyntax::FunctionCall &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::Return &);
 	};
 
@@ -278,6 +280,7 @@ private:
 		std::vector<BlockVariableMap> variables;
 		ProgramSyntax::Assignment *assignment;
 		bool assignment_target;
+		bool assign_to_subscript;
 		bool global_scope;
 
 		UnusedVariableLocator();
@@ -324,6 +327,7 @@ private:
 		using Visitor::visit;
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
+		virtual void visit(ProgramSyntax::Iteration &);
 	};
 
 	struct PrecisionRemover: BlockModifier
@@ -357,6 +361,7 @@ private:
 		LegacyConverter(const Version &);
 
 		bool check_version(const Version &) const;
+		bool check_extension(const Extension &) const;
 		using Visitor::visit;
 		bool supports_unified_interface_syntax() const;
 		virtual void visit(ProgramSyntax::VariableReference &);