X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramcompiler.h;h=0c87acf0b953a40198b60299f4288b57a0c59cbe;hb=a0caabaed3aeb8947133d78986bfb4ae5ae3c893;hp=2ef4aa7d9b77c5f853968da6e4e9dbc310c9abec;hpb=7434b80c452eb8f7ac8200a6f693a9eb668421f0;p=libs%2Fgl.git

diff --git a/source/programcompiler.h b/source/programcompiler.h
index 2ef4aa7d..0c87acf0 100644
--- a/source/programcompiler.h
+++ b/source/programcompiler.h
@@ -9,6 +9,7 @@ namespace Msp {
 namespace GL {
 
 class Program;
+class Resources;
 
 class ProgramCompiler
 {
@@ -48,6 +49,7 @@ private:
 		virtual void visit(ProgramSyntax::Assignment &);
 		virtual void visit(ProgramSyntax::FunctionCall &);
 		virtual void visit(ProgramSyntax::ExpressionStatement &);
+		virtual void visit(ProgramSyntax::Import &);
 		virtual void visit(ProgramSyntax::Layout &);
 		virtual void visit(ProgramSyntax::StructDeclaration &);
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
@@ -58,6 +60,31 @@ private:
 		virtual void visit(ProgramSyntax::Return &);
 	};
 
+	template<typename T>
+	struct NodeGatherer: Visitor
+	{
+		typedef std::list<T *> ResultType;
+
+		std::list<T *> nodes;
+
+		const ResultType &get_result() const { return nodes; }
+		virtual void visit(T &n) { nodes.push_back(&n); }
+	};
+
+	struct DeclarationCombiner: Visitor
+	{
+		bool toplevel;
+		std::map<std::string, std::vector<ProgramSyntax::FunctionDeclaration *> > functions;
+		std::map<std::string, ProgramSyntax::VariableDeclaration *> variables;
+		bool remove_node;
+
+		DeclarationCombiner();
+
+		virtual void visit(ProgramSyntax::Block &);
+		virtual void visit(ProgramSyntax::FunctionDeclaration &);
+		virtual void visit(ProgramSyntax::VariableDeclaration &);
+	};
+
 	struct VariableResolver: Visitor
 	{
 		std::vector<ProgramSyntax::Block *> blocks;
@@ -158,6 +185,7 @@ private:
 		virtual void visit(ProgramSyntax::VariableDeclaration &);
 	};
 
+	Resources *resources;
 	ProgramParser parser;
 	ProgramSyntax::Module *module;
 
@@ -165,7 +193,7 @@ public:
 	ProgramCompiler();
 
 	void compile(const std::string &);
-	void compile(IO::Base &);
+	void compile(IO::Base &, Resources * = 0);
 	void add_shaders(Program &);
 
 private:
@@ -173,6 +201,7 @@ private:
 	static ProgramSyntax::Module &get_builtins_module();
 	static ProgramSyntax::Stage *get_builtins(ProgramSyntax::StageType);
 	void process();
+	void import(const std::string &);
 	void generate(ProgramSyntax::Stage &);
 	bool optimize(ProgramSyntax::Stage &);
 	static void inject_block(ProgramSyntax::Block &, const ProgramSyntax::Block &);