X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fdebug.h;h=5b2a3d96594460459d34783a93545e22dc23cb01;hb=b23a9af95c65c01d949153fc49e5091aaa7c3d30;hp=a0da24425faa70006af7ad2ce09b49fa67575195;hpb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;p=libs%2Fgl.git

diff --git a/source/glsl/debug.h b/source/glsl/debug.h
index a0da2442..5b2a3d96 100644
--- a/source/glsl/debug.h
+++ b/source/glsl/debug.h
@@ -32,22 +32,43 @@ private:
 		Branch(Node *n): node(n) { }
 	};
 
+	struct Colors
+	{
+		const char *default_color;
+		const char *tree_color;
+		const char *location_color;
+		const char *label_color;
+		const char *type_color;
+		const char *name_color;
+		const char *error_color;
+	};
+
 	std::map<const Node *, unsigned> node_labels;
 	std::string formatted;
 	std::vector<TreeChars> tree;
+	const Colors &colors;
+
+	static const Colors no_colors;
+	static const Colors default_colors;
 
 public:
-	const std::string &apply(Stage &);
+	DumpTree(bool = false);
+
+	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 get_label(const Node &);
 	std::string format_type(TypeDeclaration *);
+	std::string format_type(const std::string &);
+	std::string format_name(const std::string &);
 
 	template<typename T>
 	typename T::const_iterator increment(typename T::const_iterator &, const T &);