Always use member access for interface blocks, even anonymous ones

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

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 5b03420223c3f70fb57f7f900f6708e2da5efe39..ef9369876b46c00221ad6e33093c6e76153fee93 100644 (file)
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -1,6 +1,7 @@
 #ifndef MSP_GL_SL_OUTPUT_H_
 #define MSP_GL_SL_OUTPUT_H_
 
+#include "compiler.h"
 #include "syntax.h"
 #include "visitor.h"
 
@@ -8,6 +9,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Formats the syntax tree as GLSL. */
 class Formatter: private TraversingVisitor
 {
 private:
@@ -17,12 +19,14 @@ private:
        unsigned source_line;
        unsigned indent;
        bool parameter_list;
-       std::string block_interface;
+       bool omit_builtin;
+       bool r_empty_name;
 
 public:
        Formatter();
 
        const std::string &apply(Stage &);
+       const std::string &apply(Node &n) { n.visit(*this); return formatted; }
 
 private:
        void append(const std::string &);
@@ -30,13 +34,16 @@ 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 &);
@@ -49,9 +56,9 @@ private:
        virtual void visit(FunctionDeclaration &);
        virtual void visit(Conditional &);
        virtual void visit(Iteration &);
+       virtual void visit(Passthrough &);
        virtual void visit(Return &);
        virtual void visit(Jump &);
-       using TraversingVisitor::visit;
 };
 
 } // namespace SL