X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Ftokenizer.cpp;h=0b18245f0e323e66c9c2eef6fb40ff19ba8307dc;hb=cdc2c7176202b4f8d1f3fd21db9c571511b32fa2;hp=6ba139ff9fd92b37a459fc619e79088902d2bea2;hpb=7b73b63df12b3ace4231842aa291d6e1d7b3f948;p=libs%2Fgl.git

diff --git a/source/glsl/tokenizer.cpp b/source/glsl/tokenizer.cpp
index 6ba139ff..0b18245f 100644
--- a/source/glsl/tokenizer.cpp
+++ b/source/glsl/tokenizer.cpp
@@ -19,7 +19,7 @@ Tokenizer::Tokenizer():
 	source_end = empty.end();
 }
 
-void Tokenizer::begin(const string &name, const string &src)
+void Tokenizer::begin(const string &src, const string &name)
 {
 	iter = src.begin();
 	source_end = src.end();
@@ -61,6 +61,7 @@ void Tokenizer::expect(const string &token)
 void Tokenizer::set_location(const Location &loc)
 {
 	location = loc;
+	suppress_line_advance = true;
 }
 
 string Tokenizer::parse_token_()