Recognize the 'f' suffix for float literals in GLSL

[libs/gl.git] / source / glsl / parser.cpp

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 9e1f1913491cf98800352d25619557a3e120bfdc..72f8ebfa6279982e675b98b9c5364044e90f3150 100644 (file)
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -268,11 +268,19 @@ RefPtr<Statement> Parser::parse_global_declaration()
                if(is_interface_qualifier(token) && tokenizer.peek_token(1)==";")
                {
                        RefPtr<InterfaceLayout> iface_lo = create_node<InterfaceLayout>();
+                       iface_lo->layout.source = layout->source;
+                       iface_lo->layout.line = layout->line;
                        iface_lo->layout.qualifiers = layout->qualifiers;
                        iface_lo->interface = tokenizer.parse_token();
                        tokenizer.expect(";");
                        return iface_lo;
                }
+               else if(is_interface_qualifier(token) && tokenizer.peek_token(2)=="{")
+               {
+                       RefPtr<InterfaceBlock> iface = parse_interface_block();
+                       iface->layout = layout;
+                       return iface;
+               }
                else
                {
                        RefPtr<VariableDeclaration> var = parse_variable_declaration();
@@ -389,9 +397,8 @@ RefPtr<Layout> Parser::parse_layout()
                if(token==")")
                        throw parse_error(tokenizer.get_location(), token, "a layout qualifier name");
 
-               layout->qualifiers.push_back(Layout::Qualifier());
+               layout->qualifiers.push_back(token);
                Layout::Qualifier &qual = layout->qualifiers.back();
-               qual.name = token;
 
                if((qual.has_value = check("=")))
                {
@@ -529,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");