Refactor the way of applying visitors to stages

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index a09c552f1fd9f05c5329edabae112ece237017b0..90cf272219b9f2ba6bde8b5c4e6c349f5676218a 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -21,13 +21,15 @@ private:
 public:
        DeclarationCombiner();
 
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+       using BlockModifier::visit;
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
 };
 
-class VariableResolver: public StageVisitor
+class VariableResolver: public TraversingVisitor
 {
 private:
        std::vector<Block *> blocks;
@@ -41,8 +43,9 @@ private:
 public:
        VariableResolver();
 
-       virtual void apply(Stage &);
-       using StageVisitor::visit;
+       void apply(Stage &);
+
+       using TraversingVisitor::visit;
        virtual void visit(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
@@ -53,13 +56,15 @@ public:
        virtual void visit(InterfaceBlock &);
 };
 
-class FunctionResolver: public StageVisitor
+class FunctionResolver: public TraversingVisitor
 {
 private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
 
 public:
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+       using TraversingVisitor::visit;
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
 };
@@ -67,6 +72,7 @@ public:
 class InterfaceGenerator: public BlockModifier
 {
 private:
+       Stage *stage;
        std::string in_prefix;
        std::string out_prefix;
        unsigned scope_level;
@@ -75,9 +81,10 @@ private:
 public:
        InterfaceGenerator();
 
+       void apply(Stage &);
+
        static std::string get_out_prefix(Stage::Type);
-       virtual void apply(Stage &);
-       using StageVisitor::visit;
+       using BlockModifier::visit;
        virtual void visit(Block &);
        std::string change_prefix(const std::string &, const std::string &) const;
        bool generate_interface(VariableDeclaration &, const std::string &, const std::string &);
@@ -87,7 +94,7 @@ public:
        virtual void visit(Passthrough &);
 };
 
-class DeclarationReorderer: public StageVisitor
+class DeclarationReorderer: public TraversingVisitor
 {
 private:
        enum DeclarationKind
@@ -107,7 +114,9 @@ private:
 public:
        DeclarationReorderer();
 
-       using StageVisitor::visit;
+       void apply(Stage &s) { visit(s.content); }
+
+       using TraversingVisitor::visit;
        virtual void visit(Block &);
        virtual void visit(FunctionCall &);
        virtual void visit(InterfaceLayout &) { kind = LAYOUT; }