Fix scoping of GLSL loop variables and function parameters

[libs/gl.git] / source / glsl / generate.h

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index aae570c4d7ad709e8f77cafc252c31b4cb2440cf..1867cc3e2a7d1a909ec3f59368216f6d69e17d23 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,23 +11,27 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: public BlockModifier
+class DeclarationCombiner: private TraversingVisitor
 {
 private:
        bool toplevel;
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
        std::map<std::string, VariableDeclaration *> variables;
+       std::set<Node *> nodes_to_remove;
 
 public:
        DeclarationCombiner();
 
-       using StageVisitor::visit;
+       void apply(Stage &);
+
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
+       using TraversingVisitor::visit;
 };
 
-class VariableResolver: public StageVisitor
+class VariableResolver: private TraversingVisitor
 {
 private:
        std::vector<Block *> blocks;
@@ -41,8 +45,9 @@ private:
 public:
        VariableResolver();
 
-       virtual void apply(Stage &);
-       using StageVisitor::visit;
+       void apply(Stage &);
+
+private:
        virtual void visit(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
@@ -51,43 +56,55 @@ public:
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &);
+       virtual void visit(Iteration &);
+       using TraversingVisitor::visit;
 };
 
-class FunctionResolver: public StageVisitor
+class FunctionResolver: private TraversingVisitor
 {
 private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
-class InterfaceGenerator: public BlockModifier
+class InterfaceGenerator: private TraversingVisitor
 {
 private:
+       Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
        unsigned scope_level;
-       std::map<std::string, RefPtr<VariableDeclaration> > iface_declarations;
+       Block *current_block;
+       NodeList<Statement>::iterator iface_insert_point;
+       NodeList<Statement>::iterator assignment_insert_point;
+       std::set<Node *> nodes_to_remove;
 
 public:
        InterfaceGenerator();
 
-       static std::string get_out_prefix(StageType);
-       virtual void apply(Stage &);
-       using StageVisitor::visit;
-       virtual void visit(Block &);
+       void apply(Stage &);
+
+private:
+       static std::string get_out_prefix(Stage::Type);
        std::string change_prefix(const std::string &, const std::string &) const;
+       virtual void visit(Block &);
        bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
        ExpressionStatement &insert_assignment(const std::string &, Expression *);
        virtual void visit(VariableReference &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(Passthrough &);
+       using TraversingVisitor::visit;
 };
 
-class DeclarationReorderer: public StageVisitor
+class DeclarationReorderer: private TraversingVisitor
 {
 private:
        enum DeclarationKind
@@ -107,7 +124,9 @@ private:
 public:
        DeclarationReorderer();
 
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionCall &);
        virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
@@ -115,6 +134,7 @@ public:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
 } // namespace SL