X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=0ff4f667d3feb830013d30c908a4eb97847b4ec4;hb=e6824add54056141e7507a33e821af01d1398973;hp=398bb214d10568800d69e757dec8eadad82efda5;hpb=57c1139e4fe21aeca7118b18eb3ba6fa43d7bf90;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 398bb214..0ff4f667 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -60,6 +60,7 @@ private:
 		virtual void visit(ProgramSyntax::Conditional &);
 		virtual void visit(ProgramSyntax::Iteration &);
 		virtual void visit(ProgramSyntax::Return &);
+		virtual void visit(ProgramSyntax::Jump &);
 	};
 
 	template<typename T>
@@ -156,6 +157,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;
@@ -190,22 +246,26 @@ private:
 
 	struct UnusedVariableLocator: Visitor
 	{
-		struct AssignmentList
+		struct VariableInfo
 		{
-			std::vector<ProgramSyntax::Node *> nodes;
-			bool conditional;
-			bool self_referencing;
+			bool local;
+			std::vector<ProgramSyntax::Node *> assignments;
+			bool conditionally_assigned;
+			bool referenced;
+
+			VariableInfo();
 		};
 
 		typedef std::set<ProgramSyntax::Node *> ResultType;
-		typedef std::map<ProgramSyntax::VariableDeclaration *, AssignmentList> BlockAssignmentMap;
+		typedef std::map<ProgramSyntax::VariableDeclaration *, VariableInfo> BlockVariableMap;
 
 		std::set<ProgramSyntax::Node *> unused_nodes;
 		std::map<ProgramSyntax::VariableDeclaration *, ProgramSyntax::Node *> aggregates;
 		ProgramSyntax::Node *aggregate;
-		std::vector<BlockAssignmentMap> assignments;
+		std::vector<BlockVariableMap> variables;
 		ProgramSyntax::Assignment *assignment;
 		bool assignment_target;
+		bool global_scope;
 
 		UnusedVariableLocator();
 
@@ -221,7 +281,7 @@ private:
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 		virtual void visit(ProgramSyntax::InterfaceBlock &);
 		virtual void visit(ProgramSyntax::FunctionDeclaration &);
-		void merge_down_assignments();
+		void merge_down_variables();
 		virtual void visit(ProgramSyntax::Conditional &);
 		virtual void visit(ProgramSyntax::Iteration &);
 	};