X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=46c37930d6d4e948299f6ef43b637746dc3e4256;hb=0ab875bdc9fbf84ecfce883b188410bb45882447;hp=8681d3638a032cabd389879922fe7378c4a45a76;hpb=f1c6ef565577ac322693255d764eea1f2cab9e77;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 8681d363..46c37930 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -38,6 +38,7 @@ private:
 
 		Formatter();
 
+		virtual void apply(ProgramSyntax::Stage &);
 		const std::string &get_result() const { return formatted; }
 		virtual void visit(ProgramSyntax::Block &);
 		virtual void visit(ProgramSyntax::Literal &);
@@ -51,6 +52,7 @@ private:
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::Import &);
 		virtual void visit(ProgramSyntax::Layout &);
+		virtual void visit(ProgramSyntax::InterfaceLayout &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::InterfaceBlock &);
@@ -116,14 +118,24 @@ private:
 		virtual void visit(ProgramSyntax::FunctionDeclaration &);
 	};
 
-	struct InterfaceGenerator: Visitor
+	struct BlockModifier: Visitor
+	{
+		bool remove_node;
+		std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
+
+		BlockModifier();
+
+		void flatten_block(ProgramSyntax::Block &);
+		void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
+		virtual void visit(ProgramSyntax::Block &);
+	};
+
+	struct InterfaceGenerator: BlockModifier
 	{
 		std::string in_prefix;
 		std::string out_prefix;
 		unsigned scope_level;
-		std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
-		bool remove_node;
-		std::list<ProgramSyntax::Node *> insert_nodes;
+		std::map<std::string, RefPtr<ProgramSyntax::VariableDeclaration> > iface_declarations;
 
 		InterfaceGenerator();
 
@@ -144,6 +156,61 @@ private:
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
+	struct DeclarationReorderer: Visitor
+	{
+		enum DeclarationKind
+		{
+			NO_DECLARATION,
+			LAYOUT,
+			STRUCT,
+			VARIABLE,
+			FUNCTION
+		};
+
+		DeclarationKind kind;
+
+		DeclarationReorderer();
+
+		virtual void visit(ProgramSyntax::Block &);
+		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::InterfaceBlock &) { kind = VARIABLE; }
+		virtual void visit(ProgramSyntax::FunctionDeclaration &) { kind = FUNCTION; }
+	};
+
+	struct InlineableFunctionLocator: Visitor
+	{
+		typedef std::set<ProgramSyntax::FunctionDeclaration *> ResultType;
+
+		std::map<ProgramSyntax::FunctionDeclaration *, unsigned> refcounts;
+		std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+		ProgramSyntax::FunctionDeclaration *in_function;
+
+		InlineableFunctionLocator();
+
+		const ResultType &get_result() const { return inlineable; }
+		virtual void visit(ProgramSyntax::FunctionCall &);
+		virtual void visit(ProgramSyntax::FunctionDeclaration &);
+	};
+
+	struct FunctionInliner: Visitor
+	{
+		std::set<ProgramSyntax::FunctionDeclaration *> inlineable;
+		unsigned extract_result;
+		RefPtr<ProgramSyntax::Expression> inline_result;
+
+		FunctionInliner();
+		FunctionInliner(const std::set<ProgramSyntax::FunctionDeclaration *> &);
+
+		void visit_and_inline(RefPtr<ProgramSyntax::Expression> &);
+		virtual void visit(ProgramSyntax::Block &);
+		virtual void visit(ProgramSyntax::UnaryExpression &);
+		virtual void visit(ProgramSyntax::BinaryExpression &);
+		virtual void visit(ProgramSyntax::FunctionCall &);
+		virtual void visit(ProgramSyntax::Return &);
+	};
+
 	struct ExpressionEvaluator: ProgramSyntax::NodeVisitor
 	{
 		typedef std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Expression *> ValueMap;
@@ -156,17 +223,16 @@ private:
 		ExpressionEvaluator(const ValueMap &);
 
 		virtual void visit(ProgramSyntax::Literal &);
+		virtual void visit(ProgramSyntax::ParenthesizedExpression &);
 		virtual void visit(ProgramSyntax::VariableReference &);
 		virtual void visit(ProgramSyntax::UnaryExpression &);
 		virtual void visit(ProgramSyntax::BinaryExpression &);
 	};
 
-	struct ConstantConditionEliminator: Visitor
+	struct ConstantConditionEliminator: BlockModifier
 	{
 		unsigned scope_level;
 		ExpressionEvaluator::ValueMap variable_values;
-		bool remove_node;
-		ProgramSyntax::Block *replacement_block;
 
 		ConstantConditionEliminator();
 
@@ -238,6 +304,22 @@ private:
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
+	struct LegacyConverter: BlockModifier
+	{
+		Version target_version;
+		std::string type;
+		std::string frag_out_name;
+
+		LegacyConverter();
+		LegacyConverter(const Version &);
+
+		bool check_version(const Version &);
+		virtual void visit(ProgramSyntax::VariableReference &);
+		virtual void visit(ProgramSyntax::FunctionCall &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+		virtual void visit(ProgramSyntax::InterfaceBlock &);
+	};
+
 	Resources *resources;
 	ProgramParser parser;
 	ProgramSyntax::Module *module;