X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Foutput.h;fp=source%2Fglsl%2Foutput.h;h=06bb5fd18f7069001b0275e29cc2d7986d40b0a5;hb=1fa69bb8eec3070f5da296d6dd0bd67aea62d3bf;hp=b58c3f96f2ed7560c5ce85db1d5ffb6380aad87b;hpb=a93a69e53263005709fa172845b01f81cd1c074c;p=libs%2Fgl.git

diff --git a/source/glsl/output.h b/source/glsl/output.h
index b58c3f96..06bb5fd1 100644
--- a/source/glsl/output.h
+++ b/source/glsl/output.h
@@ -8,12 +8,10 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-class Formatter: public StageVisitor
+class Formatter: public TraversingVisitor
 {
-public:
-	typedef std::string ResultType;
-
 private:
+	Stage *stage;
 	std::string formatted;
 	unsigned source_index;
 	unsigned source_line;
@@ -24,14 +22,14 @@ private:
 public:
 	Formatter();
 
-	virtual void apply(Stage &);
-	const std::string &get_result() const { return formatted; }
+	const std::string &apply(Stage &);
+
 private:
 	void append(const std::string &);
 	void append(char);
 	void set_source(unsigned, unsigned);
 public:
-	using StageVisitor::visit;
+	using TraversingVisitor::visit;
 	virtual void visit(Block &);
 	virtual void visit(Literal &);
 	virtual void visit(ParenthesizedExpression &);