diff --git a/src/language/ast/ASTBuilder.cpp b/src/language/ast/ASTBuilder.cpp index 57db204973de150fa86b4070f8704e8ac71f6a40..35d787354c37e5b1dbc3f176548fb4725d924cbb 100644 --- a/src/language/ast/ASTBuilder.cpp +++ b/src/language/ast/ASTBuilder.cpp @@ -143,11 +143,6 @@ struct ASTBuilder::simplify_node_list : parse_tree::apply<ASTBuilder::simplify_n n = std::move(n->children.back()); transform(n, st...); } - } else if (n->is_type<language::expression_list>()) { - if ((n->children.size() == 1) and (not n->children[0]->is_type<language::tuple_expression>())) { - n = std::move(n->children.back()); - transform(n, st...); - } } } }; @@ -260,6 +255,7 @@ using selector = parse_tree::selector< language::fct_declaration, language::type_mapping, language::function_definition, + language::expression_list, language::if_statement, language::do_while_statement, language::while_statement, @@ -308,8 +304,7 @@ using selector = parse_tree::selector< language::post_plusplus>, ASTBuilder::simplify_for_statement_block::on<language::for_statement_block>, parse_tree::discard_empty::on<language::ignored, language::semicol, language::block>, - ASTBuilder::simplify_node_list:: - on<language::name_list, language::lvalue_list, language::function_argument_list, language::expression_list>, + ASTBuilder::simplify_node_list::on<language::name_list, language::lvalue_list, language::function_argument_list>, ASTBuilder::simplify_statement_block::on<language::statement_block>, ASTBuilder::simplify_for_init::on<language::for_init>, ASTBuilder::simplify_for_test::on<language::for_test>,