Adjust member access of the various visitors in the GLSL compiler

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

diff --git a/source/glsl/generate.h b/source/glsl/generate.h
index 90cf272219b9f2ba6bde8b5c4e6c349f5676218a..0c2a0ad8fce4b03aee235202f9a4eaebe0937d59 100644 (file)
--- a/source/glsl/generate.h
+++ b/source/glsl/generate.h
@@ -11,7 +11,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class DeclarationCombiner: public BlockModifier
+class DeclarationCombiner: private BlockModifier
 {
 private:
        bool toplevel;
@@ -23,13 +23,14 @@ public:
 
        void apply(Stage &s) { visit(s.content); }
 
-       using BlockModifier::visit;
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(VariableDeclaration &);
+       using BlockModifier::visit;
 };
 
-class VariableResolver: public TraversingVisitor
+class VariableResolver: private TraversingVisitor
 {
 private:
        std::vector<Block *> blocks;
@@ -45,7 +46,7 @@ public:
 
        void apply(Stage &);
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(Block &);
        virtual void visit(VariableReference &);
        virtual void visit(MemberAccess &);
@@ -54,9 +55,10 @@ public:
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &);
+       using TraversingVisitor::visit;
 };
 
-class FunctionResolver: public TraversingVisitor
+class FunctionResolver: private TraversingVisitor
 {
 private:
        std::map<std::string, std::vector<FunctionDeclaration *> > functions;
@@ -64,12 +66,13 @@ private:
 public:
        void apply(Stage &s) { visit(s.content); }
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(FunctionCall &);
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
-class InterfaceGenerator: public BlockModifier
+class InterfaceGenerator: private BlockModifier
 {
 private:
        Stage *stage;
@@ -83,18 +86,19 @@ public:
 
        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 &);
        virtual void visit(VariableDeclaration &);
        virtual void visit(Passthrough &);
+       using BlockModifier::visit;
 };
 
-class DeclarationReorderer: public TraversingVisitor
+class DeclarationReorderer: private TraversingVisitor
 {
 private:
        enum DeclarationKind
@@ -116,7 +120,7 @@ public:
 
        void apply(Stage &s) { visit(s.content); }
 
-       using TraversingVisitor::visit;
+private:
        virtual void visit(Block &);
        virtual void visit(FunctionCall &);
        virtual void visit(InterfaceLayout &) { kind = LAYOUT; }
@@ -124,6 +128,7 @@ public:
        virtual void visit(VariableDeclaration &);
        virtual void visit(InterfaceBlock &) { kind = VARIABLE; }
        virtual void visit(FunctionDeclaration &);
+       using TraversingVisitor::visit;
 };
 
 } // namespace SL