X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;h=ec794912adfd55c8d42d49b806bc0ce292be0ecc;hb=77f6973f58167d94059d3f324c29ab2ca8de4544;hp=0a506a5d9e15b2080a392eb5ef628730683d9de7;hpb=3e24a1bfd5a259b185ff0f37046dd0489e1908a3;p=libs%2Fgl.git

diff --git a/source/glsl/output.h b/source/glsl/output.h
index 0a506a5d..ec794912 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -13,19 +13,17 @@ namespace SL {
 class Formatter: private TraversingVisitor
 {
 private:
-	Stage *stage;
+	Stage *stage = 0;
 	std::string formatted;
-	unsigned source_index;
-	unsigned source_line;
-	unsigned indent;
-	bool parameter_list;
-	bool omit_builtin;
+	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 &);
-	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 &);