Move parenthesizing expressions to Formatter

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

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 61c02caada72aed11f5e7361c55b639ccde449b9..efcde5d66f30440bfbcbe24bee9c39ce86d34c29 100644 (file)
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -14,17 +14,17 @@ class Formatter: private TraversingVisitor
 {
 private:
        Stage *stage;
-       Compiler::Mode mode;
        std::string formatted;
        unsigned source_index;
        unsigned source_line;
        unsigned indent;
        bool parameter_list;
+       bool omit_builtin;
 
 public:
        Formatter();
 
-       const std::string &apply(Stage &, Compiler::Mode);
+       const std::string &apply(Stage &);
        const std::string &apply(Node &n) { n.visit(*this); return formatted; }
 
 private:
@@ -33,6 +33,7 @@ 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 &);
@@ -42,6 +43,7 @@ private:
        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 &);