From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id C758A3839DD7; Wed, 31 Aug 2022 10:41:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C758A3839DD7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1661942485; bh=awgemxwS+Hw1897CxgboMcx02rqwqvIi9nPYr/p8KcY=; h=From:To:Subject:Date:From; b=YLK3WRllIAWkJ32htOEfrS/DOdPcdDm6MRAvbDWIyFX3pGhq11gC8CbqLXaT9kAz4 Hzv6M9Z4SFChYgyQ9hX14F0MG3ud9ColiJMajkUWxWnW4I1W/jYoxmqEvzcO/bnnXx s/p/XBCCLQlko0NPQHrjOThy98XlJiQAzGdGKY9Y= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] ast: Add better assertion on AST fragments X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 842829a591c39c24332c3605606f5d89ff89f7d6 X-Git-Newrev: fcf6fea382f65930cd4f32f7661bc5d64d1559b4 Message-Id: <20220831104125.C758A3839DD7@sourceware.org> Date: Wed, 31 Aug 2022 10:41:25 +0000 (GMT) List-Id: https://gcc.gnu.org/g:fcf6fea382f65930cd4f32f7661bc5d64d1559b4 commit fcf6fea382f65930cd4f32f7661bc5d64d1559b4 Author: Arthur Cohen Date: Mon Aug 29 14:59:18 2022 +0200 ast: Add better assertion on AST fragments Co-authored-by: philberty Diff: --- gcc/rust/ast/rust-ast.h | 47 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h index 0b032a6637f..e9e16e77f65 100644 --- a/gcc/rust/ast/rust-ast.h +++ b/gcc/rust/ast/rust-ast.h @@ -1819,7 +1819,7 @@ public: return true; } - std::string as_string () + std::string as_string () const { switch (kind) { @@ -1869,14 +1869,45 @@ private: */ bool is_single_fragment () const { return nodes.size () == 1; } - bool is_single_fragment (SingleASTNode::NodeType expected) const + + bool is_single_fragment_of_kind (SingleASTNode::NodeType expected) const { return is_single_fragment () && nodes[0].get_kind () == expected; } - bool is_single_fragment_kind (SingleASTNode::NodeType kind) const + void assert_single_fragment (SingleASTNode::NodeType expected) const { - return is_single_fragment () && nodes[0].get_kind () == kind; + static const std::map str_map = { + {SingleASTNode::NodeType::IMPL, "impl"}, + {SingleASTNode::NodeType::ITEM, "item"}, + {SingleASTNode::NodeType::TYPE, "type"}, + {SingleASTNode::NodeType::EXPRESSION, "expr"}, + {SingleASTNode::NodeType::STMT, "stmt"}, + {SingleASTNode::NodeType::EXTERN, "extern"}, + {SingleASTNode::NodeType::TRAIT, "trait"}, + {SingleASTNode::NodeType::TRAIT_IMPL, "trait impl"}, + }; + + auto actual = nodes[0].get_kind (); + auto fail = false; + + if (!is_single_fragment ()) + { + rust_error_at (Location (), "fragment is not single"); + fail = true; + } + + if (actual != expected) + { + rust_error_at ( + Location (), + "invalid fragment operation: expected %qs node, got %qs node", + str_map.find (expected)->second, + str_map.find (nodes[0].get_kind ())->second); + fail = true; + } + + rust_assert (!fail); } public: @@ -1920,23 +1951,23 @@ public: bool is_expression_fragment () const { - return is_single_fragment (SingleASTNode::NodeType::EXPRESSION); + return is_single_fragment_of_kind (SingleASTNode::NodeType::EXPRESSION); } bool is_type_fragment () const { - return is_single_fragment (SingleASTNode::NodeType::TYPE); + return is_single_fragment_of_kind (SingleASTNode::NodeType::TYPE); } std::unique_ptr take_expression_fragment () { - rust_assert (is_single_fragment_kind (SingleASTNode::NodeType::EXPRESSION)); + assert_single_fragment (SingleASTNode::NodeType::EXPRESSION); return nodes[0].take_expr (); } std::unique_ptr take_type_fragment () { - rust_assert (is_single_fragment_kind (SingleASTNode::NodeType::TYPE)); + assert_single_fragment (SingleASTNode::NodeType::TYPE); return nodes[0].take_type (); }