Check the flat qualifier from the correct member

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

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 61c02caada72aed11f5e7361c55b639ccde449b9..ec794912adfd55c8d42d49b806bc0ce292be0ecc 100644 (file)
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -13,19 +13,17 @@ namespace SL {
 class Formatter: private TraversingVisitor
 {
 private:
-       Stage *stage;
-       Compiler::Mode mode;
+       Stage *stage = 0;
        std::string formatted;
-       unsigned source_index;
-       unsigned source_line;
-       unsigned indent;
-       bool parameter_list;
+       unsigned source_index = 0;
+       unsigned source_line = 1;
+       unsigned indent = 0;
+       bool parameter_list = false;
+       bool omit_builtin = false;
+       bool r_empty_name = false;
 
 public:
-       Formatter();
-
-       const std::string &apply(Stage &, Compiler::Mode);
-       const std::string &apply(Node &n) { n.visit(*this); return formatted; }
+       std::string apply(Stage &);
 
 private:
        void append(const std::string &);
@@ -33,15 +31,15 @@ private:
        void set_source(unsigned, unsigned);
 
        virtual void visit(Block &);
+       void visit_expression(Expression &, const Operator *, bool);
        virtual void visit(Literal &);
-       virtual void visit(ParenthesizedExpression &);
        virtual void visit(VariableReference &);
-       virtual void visit(InterfaceBlockReference &);
        virtual void visit(MemberAccess &);
        virtual void visit(Swizzle &);
        virtual void visit(UnaryExpression &);
        virtual void visit(BinaryExpression &);
        virtual void visit(Assignment &);
+       virtual void visit(TernaryExpression &);
        virtual void visit(FunctionCall &);
        virtual void visit(ExpressionStatement &);
        virtual void visit(Import &);
@@ -50,7 +48,6 @@ private:
        virtual void visit(InterfaceLayout &);
        virtual void visit(StructDeclaration &);
        virtual void visit(VariableDeclaration &);
-       virtual void visit(InterfaceBlock &);
        virtual void visit(FunctionDeclaration &);
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);