X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=ac1f910d530dd7b53c984c195d3d4310d372c39f;hb=4fe225bf15048fcb7a678370f87d09f2de37031a;hp=8ae22901e89dcbfb19bf08fc2a25929aaddf9188;hpb=74bd3813b9744550c9ac5980588e561835b616d9;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 8ae22901..ac1f910d 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -52,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 &);
@@ -59,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>
@@ -120,12 +122,12 @@ private:
 	struct BlockModifier: Visitor
 	{
 		bool remove_node;
-		std::list<ProgramSyntax::Node *> insert_nodes;
+		std::list<RefPtr<ProgramSyntax::Node> > insert_nodes;
 
 		BlockModifier();
 
 		void flatten_block(ProgramSyntax::Block &);
-		void apply_and_increment(ProgramSyntax::Block &, std::list<ProgramSyntax::NodePtr<ProgramSyntax::Node> >::iterator &);
+		void apply_and_increment(ProgramSyntax::Block &, std::list<RefPtr<ProgramSyntax::Node> >::iterator &);
 		virtual void visit(ProgramSyntax::Block &);
 	};
 
@@ -134,7 +136,7 @@ private:
 		std::string in_prefix;
 		std::string out_prefix;
 		unsigned scope_level;
-		std::map<std::string, ProgramSyntax::VariableDeclaration *> iface_declarations;
+		std::map<std::string, RefPtr<ProgramSyntax::VariableDeclaration> > iface_declarations;
 
 		InterfaceGenerator();
 
@@ -155,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;
@@ -167,6 +224,7 @@ 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 &);
@@ -188,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();
 
@@ -214,12 +276,13 @@ private:
 		virtual void visit(ProgramSyntax::BinaryExpression &);
 		virtual void visit(ProgramSyntax::Assignment &);
 		void record_assignment(ProgramSyntax::VariableDeclaration &, ProgramSyntax::Node &, bool);
+		void clear_assignments(VariableInfo &, bool);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
 		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 &);
 	};