X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Ftokenizer.cpp;h=4064d805e732dc8adaf5dbb912df1ce0824909bb;hp=2fa1b64ae960be301874c872c60c67c70f23cd13;hb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;hpb=2016444ee144ce41f88c48e89c825137ad7e4ec2

diff --git a/source/glsl/tokenizer.cpp b/source/glsl/tokenizer.cpp
index 2fa1b64a..4064d805 100644
--- a/source/glsl/tokenizer.cpp
+++ b/source/glsl/tokenizer.cpp
@@ -10,9 +10,7 @@ namespace Msp {
 namespace GL {
 namespace SL {
 
-Tokenizer::Tokenizer():
-	allow_preprocess(true),
-	suppress_line_advance(false)
+Tokenizer::Tokenizer()
 {
 	static string empty;
 	iter = empty.begin();
@@ -95,7 +93,7 @@ void Tokenizer::preprocess()
 {
 	SetForScope<deque<string> > clear_tokens(next_tokens, deque<string>());
 
-	string::const_iterator line_end = iter;
+	auto line_end = iter;
 	for(; (line_end!=source_end && *line_end!='\n'); ++line_end) ;
 	SetForScope<string::const_iterator> stop_at_line_end(source_end, line_end);
 
@@ -157,7 +155,7 @@ string Tokenizer::parse_number()
 		if(!require_digit && iter!=source_end && *iter=='f')
 			number += *iter++;
 	}
-	else if(*iter=='f')
+	else if(*iter=='u' || *iter=='f')
 		number += *iter++;
 
 	if(require_digit)