X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fdebug.h;h=c3e9c701075b87974a7e5101ad635bf0bf8e5d8b;hp=3837c569bb18e13aacf3d02a9d1d58eadecd5cb0;hb=241cf36a6d7735706804bb3c517529bbe078f1ee;hpb=f526938b407e061c7424adedc34af4d1ff687f90

diff --git a/source/glsl/debug.h b/source/glsl/debug.h
index 3837c569..c3e9c701 100644
--- a/source/glsl/debug.h
+++ b/source/glsl/debug.h
@@ -37,15 +37,17 @@ private:
 	std::vector<TreeChars> tree;
 
 public:
-	const std::string &apply(Stage &);
+	std::string apply(Stage &);
+	std::string apply(Node &n) { n.visit(*this); return formatted; }
 
 private:
 	void append(const std::string &);
+	void append(const Node &, const std::string &);
 	void append_subtree(const std::vector<Branch> &);
+	void append_subtree(Node &);
 	void begin_sub();
 	void last_branch();
 	void end_sub();
-	void annotated_branch(const std::string &, Node &);
 	unsigned get_label(const Node &);
 	std::string format_type(TypeDeclaration *);
 
@@ -54,7 +56,6 @@ private:
 
 	virtual void visit(Block &);
 	virtual void visit(Literal &);
-	virtual void visit(ParenthesizedExpression &);
 	virtual void visit(VariableReference &);
 	virtual void visit(InterfaceBlockReference &);
 	virtual void visit(MemberAccess &);
@@ -62,6 +63,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 &);