X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fparser.cpp;fp=source%2Fglsl%2Fparser.cpp;h=72f8ebfa6279982e675b98b9c5364044e90f3150;hb=2016444ee144ce41f88c48e89c825137ad7e4ec2;hp=6a055c0cd3ebb718830e65175efa15aa3bf10ca1;hpb=49080e2c9359a3929e77817707ad7e8bf3f8a36d;p=libs%2Fgl.git

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 6a055c0c..72f8ebfa 100644
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -536,10 +536,12 @@ RefPtr<Literal> Parser::parse_literal()
 	if(isdigit(literal->token[0]))
 	{
 		// TODO have the tokenizer return the type of the token
-		if(isnumrc(literal->token))
-			literal->value = lexical_cast<int>(literal->token);
-		else
+		if(literal->token.back()=='f')
+			literal->value = lexical_cast<float>(literal->token.substr(0, literal->token.size()-1));
+		else if(literal->token.find('.')!=string::npos)
 			literal->value = lexical_cast<float>(literal->token);
+		else
+			literal->value = lexical_cast<int>(literal->token);
 	}
 	else if(literal->token=="true" || literal->token=="false")
 		literal->value = (literal->token=="true");