X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=dbdd888e5923aa69355c9fe75923bcadf7e12c61;hp=b58c3f96f2ed7560c5ce85db1d5ffb6380aad87b;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=696a97bd7411d69953c1a9e4b5f3dfb4c1d848f1

diff --git a/source/glsl/output.h b/source/glsl/output.h
index b58c3f96..dbdd888e 100644
--- 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,38 +9,38 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class Formatter: public StageVisitor
+/** Formats the syntax tree as GLSL. */
+class Formatter: private TraversingVisitor
 {
-public:
-	typedef std::string ResultType;
-
 private:
+	Stage *stage = 0;
 	std::string formatted;
-	unsigned source_index;
-	unsigned source_line;
-	unsigned indent;
-	bool parameter_list;
-	std::string block_interface;
+	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();
+	std::string apply(Stage &);
 
-	virtual void apply(Stage &);
-	const std::string &get_result() const { return formatted; }
 private:
 	void append(const std::string &);
 	void append(char);
 	void set_source(unsigned, unsigned);
-public:
-	using StageVisitor::visit;
+
 	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 &);
@@ -52,6 +53,7 @@ public:
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);
+	virtual void visit(Passthrough &);
 	virtual void visit(Return &);
 	virtual void visit(Jump &);
 };