Refactor Parser::parse_expression to take a pointer to the outer operator

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

diff --git a/source/glsl/parser.cpp b/source/glsl/parser.cpp
index c924606f09c018c33388b020ec23100aa5a291f4..b4631daf6d1c4e5b3cafa638400bd94e9d157074 100644 (file)
--- a/source/glsl/parser.cpp
+++ b/source/glsl/parser.cpp
@@ -434,8 +434,9 @@ void Parser::parse_block(Block &block, bool require_braces, RefPtr<T> (Parser::*
                tokenizer.expect("}");
 }
 
-RefPtr<Expression> Parser::parse_expression(unsigned precedence)
+RefPtr<Expression> Parser::parse_expression(const Operator *outer_oper)
 {
+       unsigned outer_precedence = (outer_oper ? outer_oper->precedence+(outer_oper->assoc==Operator::RIGHT_TO_LEFT) : 20);
        RefPtr<Expression> left;
        VariableReference *left_var = 0;
        while(1)
@@ -447,7 +448,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 && oper->precedence>=outer_precedence);
+               if(token==";" || token==")" || token=="]" || token=="," || lower_precedence)
                {
                        if(left)
                                return left;
@@ -509,7 +511,7 @@ RefPtr<Expression> Parser::parse_expression(unsigned precedence)
                                RefPtr<UnaryExpression> unary = create_node<UnaryExpression>();
                                unary->oper = oper;
                                tokenizer.parse_token();
-                               unary->expression = parse_expression(oper->precedence);
+                               unary->expression = parse_expression(oper);
                                left = unary;
                        }
                        else
@@ -551,7 +553,7 @@ RefPtr<BinaryExpression> Parser::parse_binary(const RefPtr<Expression> &left, co
                tokenizer.expect("]");
        }
        else
-               binary->right = parse_expression(oper.precedence+(oper.assoc==Operator::RIGHT_TO_LEFT));
+               binary->right = parse_expression(&oper);
        return binary;
 }
 
@@ -775,7 +777,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();