X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.h;fp=source%2Fglsl%2Fparser.h;h=743149d83362a84be8b91e5b13dad8789e90bede;hb=47286086863b6009192ffdb3d3471c83211ee943;hp=c9588bfbdd99486a0e759df55ebd7c520ebeefb0;hpb=c1b0303f65ee966a973197cbdbf177c571478674;p=libs%2Fgl.git

diff --git a/source/glsl/parser.h b/source/glsl/parser.h
index c9588bfb..743149d8 100644
--- a/source/glsl/parser.h
+++ b/source/glsl/parser.h
@@ -12,6 +12,12 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
+struct Location
+{
+	std::string name;
+	unsigned line;
+};
+
 class Parser
 {
 private:
@@ -38,9 +44,8 @@ private:
 	};
 
 	std::string source;
-	std::string source_name;
 	unsigned source_index;
-	unsigned current_line;
+	Location location;
 	std::string::const_iterator iter;
 	std::string::const_iterator source_end;
 	bool allow_preprocess;
@@ -63,9 +68,6 @@ public:
 private:
 	void parse_source();
 
-	std::string format_error(const std::string &);
-	std::string format_syntax_error(const std::string &);
-
 	const std::string &peek_token(unsigned = 0);
 	const std::string &parse_token();
 	std::string parse_token_();