Rename InterfaceBlock::name to block_name for clarity

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

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index 7b034a4c671f1d854a06cfabcaad83d94859aa88..9e1f1913491cf98800352d25619557a3e120bfdc 100644 (file)
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -496,10 +496,8 @@ RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
                        if(token=="(")
                        {
                                tokenizer.parse_token();
-                               RefPtr<ParenthesizedExpression> parexpr = create_node<ParenthesizedExpression>();
-                               parexpr->expression = parse_expression();
+                               left = parse_expression();
                                tokenizer.expect(")");
-                               left = parexpr;
                        }
                        else if(isdigit(token[0]) || token=="true" || token=="false")
                                left = parse_literal();
@@ -577,7 +575,6 @@ RefPtr<FunctionCall> Parser::parse_function_call(const VariableReference &var)
 {
        RefPtr<FunctionCall> call = create_node<FunctionCall>();
        call->name = var.name;
-       call->constructor = is_type(call->name);
        call->oper = &Operator::get_operator("(", Operator::POSTFIX);
        tokenizer.expect("(");
        while(tokenizer.peek_token()!=")")
@@ -795,7 +792,7 @@ RefPtr<InterfaceBlock> Parser::parse_interface_block()
        if(!is_interface_qualifier(iface->interface))
                throw parse_error(tokenizer.get_location(), iface->interface, "an interface qualifier");
 
-       iface->name = expect_identifier();
+       iface->block_name = expect_identifier();
        iface->members = new Block;
        parse_block(*iface->members, true, &Parser::parse_variable_declaration_with_layout);
        if(!check(";"))