Remove the using declarations from visitors

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 90cf272219b9f2ba6bde8b5c4e6c349f5676218a..6740f38ea5c49e531b9fbbabf9b285e08ea7f24b 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,30 +11,37 @@ 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();
-
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &);
 
-       using BlockModifier::visit;
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
 };
 
-class VariableResolver: public TraversingVisitor
+class BlockResolver: private TraversingVisitor
 {
+public:
+       void apply(Stage &s) { s.content.visit(*this); }
+
 private:
-       std::vector<Block *> blocks;
+       virtual void visit(Block &);
+       virtual void visit(InterfaceBlock &);
+};
+
+class VariableResolver: private TraversingVisitor
+{
+private:
+       Block *builtins;
        StructDeclaration *type;
-       bool anonymous;
        std::string block_interface;
        bool record_target;
        VariableDeclaration *assignment_target;
@@ -45,7 +52,9 @@ public:
 
        void apply(Stage &);
 
-       using TraversingVisitor::visit;
+private:
+       Block *next_block(Block &);
+
        virtual void visit(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
@@ -54,39 +63,42 @@ public:
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
+       virtual void visit(FunctionDeclaration &);
+       virtual void visit(Iteration &);
 };
 
-class FunctionResolver: public TraversingVisitor
+class FunctionResolver: private TraversingVisitor
 {
 private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
 };
 
-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;
+       NodeList<Statement>::iterator iface_insert_point;
+       NodeList<Statement>::iterator assignment_insert_point;
+       std::set<Node *> nodes_to_remove;
 
 public:
        InterfaceGenerator();
 
        void apply(Stage &);
 
+private:
        static std::string get_out_prefix(Stage::Type);
-       using BlockModifier::visit;
-       virtual void visit(Block &);
        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 &);
@@ -94,7 +106,7 @@ public:
        virtual void visit(Passthrough &);
 };
 
-class DeclarationReorderer: public TraversingVisitor
+class DeclarationReorderer: private TraversingVisitor
 {
 private:
        enum DeclarationKind
@@ -106,7 +118,6 @@ private:
                FUNCTION
        };
 
-       unsigned scope_level;
        DeclarationKind kind;
        std::set<Node *> ordered_funcs;
        std::set<Node *> needed_funcs;
@@ -114,9 +125,9 @@ private:
 public:
        DeclarationReorderer();
 
-       void apply(Stage &s) { visit(s.content); }
+       void apply(Stage &s) { s.content.visit(*this); }
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionCall &);
        virtual void visit(InterfaceLayout &) { kind = LAYOUT; }