X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fdebug.h;h=da888198414f8a7d891a7884a5ddbedd45d7b4cd;hp=b2de993da648e39a06a8f8f93d03c112b596cd39;hb=2280a09a286bbff2eb41783f8023863f320a3736;hpb=50ab5ca2babc8d9592903da6072a13b381ed6656

diff --git a/source/glsl/debug.h b/source/glsl/debug.h
index b2de993d..da888198 100644
--- a/source/glsl/debug.h
+++ b/source/glsl/debug.h
@@ -22,19 +22,31 @@ private:
 		REACH = 0x2574         // ╴
 	};
 
+	struct Branch
+	{
+		std::string text;
+		Node *node;
+
+		Branch(const char *t, Node *n = 0): text(t), node(n) { }
+		Branch(const std::string &t, Node *n = 0): text(t), node(n) { }
+		Branch(Node *n): node(n) { }
+	};
+
 	std::map<const Node *, unsigned> node_labels;
 	std::string formatted;
 	std::vector<TreeChars> tree;
 
 public:
-	const std::string &apply(Stage &);
+	std::string apply(Stage &);
 
 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 *);
 
@@ -43,13 +55,14 @@ 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 &);
+	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 &);