X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fdebug.h;h=b3682e7b30a98915ff219aaf09a03113beacc9c3;hp=6aca7af0fb2a94b0aab0b8936f1c9ea902021d2a;hb=HEAD;hpb=bd8816692056230c36504dcccd76c6946dff47b1

diff --git a/source/glsl/debug.h b/source/glsl/debug.h
index 6aca7af0..b3682e7b 100644
--- a/source/glsl/debug.h
+++ b/source/glsl/debug.h
@@ -8,6 +8,8 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+/** Creates a textual representation of the syntax tree.  The result is encoded
+as UTF-8. */
 class DumpTree: private TraversingVisitor
 {
 private:
@@ -20,42 +22,76 @@ 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) { }
+	};
+
+	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 &);
 
 	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 &);
 	virtual void visit(Precision &);
 	virtual void visit(Layout &);
 	virtual void visit(InterfaceLayout &);
+	virtual void visit(BasicTypeDeclaration &);
+	virtual void visit(ImageTypeDeclaration &);
 	virtual void visit(StructDeclaration &);
 	virtual void visit(VariableDeclaration &);
-	virtual void visit(InterfaceBlock &);
 	virtual void visit(FunctionDeclaration &);
 	virtual void visit(Conditional &);
 	virtual void visit(Iteration &);