diff --git a/src/plugins/cpptools/cppmodelmanager.cpp b/src/plugins/cpptools/cppmodelmanager.cpp index b00596df85cce06cb49f8a779253b268f296af50..b1ed719a36532d60bd58de2b35e73aa13cfcf80e 100644 --- a/src/plugins/cpptools/cppmodelmanager.cpp +++ b/src/plugins/cpptools/cppmodelmanager.cpp @@ -529,27 +529,22 @@ protected: return true; } - virtual bool visit(BinaryExpressionAST *ast) + virtual bool visit(CastExpressionAST *ast) { - if (ast->right_expression) { - if (CastExpressionAST *right_cast_expr = ast->right_expression->asCastExpression()) { - if (right_cast_expr->type_id) { - if (TypeIdAST *right_cast_type_id = right_cast_expr->type_id->asTypeId()) { - SpecifierAST *type_specifier = right_cast_type_id->type_specifier; - if (! right_cast_type_id->declarator && type_specifier && ! type_specifier->next && - type_specifier->asNamedTypeSpecifier() && right_cast_expr->expression && - right_cast_expr->expression->asUnaryExpression()) { - // this ast node is ambigious, e.g. - // 1 + (a) + b - // it can be parsed as - // 1 + ((a) + b) - // or - // 1 + (a) (+b) - accept(ast->left_expression); - accept(right_cast_expr->expression); - return false; - } - } + if (ast->lparen_token && ast->type_id && ast->rparen_token && ast->expression) { + if (TypeIdAST *cast_type_id = ast->type_id->asTypeId()) { + SpecifierAST *type_specifier = cast_type_id->type_specifier; + if (! cast_type_id->declarator && type_specifier && ! type_specifier->next && + type_specifier->asNamedTypeSpecifier() && ast->expression && + ast->expression->asUnaryExpression()) { + // this ast node is ambigious, e.g. + // (a) + b + // it can be parsed as + // ((a) + b) + // or + // (a) (+b) + accept(ast->expression); + return false; } } }