Transform interface block contents into structs

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

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index c9a812ddbd62f8c45184d565186404b33541f410..fd782648083bdb05a1aa700ca65d4ab8f15aa926 100644 (file)
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -447,7 +447,8 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
                        if(token==i->token && (!left || i->type!=Operator::PREFIX) && (left || i->type!=Operator::POSTFIX))
                                oper = i;
 
-               if(token==";" || token==")" || token=="]" || token=="," || (oper && precedence && oper->precedence>=precedence))
+               bool lower_precedence = (oper && oper->type!=Operator::PREFIX && precedence && oper->precedence>=precedence);
+               if(token==";" || token==")" || token=="]" || token=="," || lower_precedence)
                {
                        if(left)
                                return left;
@@ -496,11 +497,7 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
                                left = parexpr;
                        }
                        else if(isdigit(token[0]) || token=="true" || token=="false")
-                       {
-                               RefPtr<Literal> literal = new Literal;
-                               literal->token = tokenizer.parse_token();
-                               left = literal;
-                       }
+                               left = parse_literal();
                        else if(is_identifier(token))
                        {
                                RefPtr<VariableReference> var = create_node<VariableReference>();
@@ -522,6 +519,26 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
        }
 }
 
+RefPtr<Literal> Parser::parse_literal()
+{
+       RefPtr<Literal> literal = create_node<Literal>();
+       literal->token = tokenizer.parse_token();
+       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
+                       literal->value = lexical_cast<float>(literal->token);
+       }
+       else if(literal->token=="true" || literal->token=="false")
+               literal->value = (literal->token=="true");
+       else
+               throw parse_error(tokenizer.get_location(), literal->token, "a literal");
+
+       return literal;
+}
+
 RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, const Operator &oper)
 {
        RefPtr<BinaryExpression> binary = (oper.precedence==16 ?
@@ -759,7 +776,8 @@ RefPtr<InterfaceBlock> Parser::parse_interface_block()
                throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
 
        iface->name = expect_identifier();
-       parse_block(iface->members, true, &Parser::parse_variable_declaration_with_layout);
+       iface->members = new Block;
+       parse_block(*iface->members, true, &Parser::parse_variable_declaration_with_layout);
        if(!check(";"))
        {
                iface->instance_name = expect_identifier();