From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by sourceware.org (Postfix) with ESMTPS id CF449382E6B6 for ; Tue, 31 Jan 2023 13:21:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CF449382E6B6 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x331.google.com with SMTP id j32-20020a05600c1c2000b003dc4fd6e61dso5585860wms.5 for ; Tue, 31 Jan 2023 05:21:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pT5a0kbz8QHiTie/n/SGjA7lmRUARvpDckymDrbsfMw=; b=brZJ7S70WG8YTl2bxMn7tLIMsEqm60X1arVJeNP4jiDOjJGVFblahmIV4w+/s6VZkh uUu0hvQ/pYYW9m0W8w07HddohIoHf+LOIPzUzymibTh2Qy6H7YGi166Ce+8pAM8kpuqf KiZzCHRUYVV4vnvHtE3TX5x5qrjSwXbtT9I8adIaCBec/pOXJr25HcURj9F1AfA+wOq2 qgkGL4vjLxYsTVav/lekce1d+UValzjIsXbvvHG+QSfTpL+xPTB79RYrXJ6agRAHRylf 4u8evLL7dV1f24akRSbdVblYxjMqlxaKQ8sVTwnxd7EcTLqGiAMZoSP/AAJKZrnKmm43 Jtww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pT5a0kbz8QHiTie/n/SGjA7lmRUARvpDckymDrbsfMw=; b=3mScKS9YxpUxHOxz219mjBnT/WZ6tHhJSMriOb6zpsyZ2f5ZCvu3InNDRosNKjt+YX xjTS8yEL/KAbMo4CrN99WMvFFh6nYpZk7Xvt7e+VgMfn3vb4Ydlr+6mhI+ilwdhFmJK3 FnZsaMoeiMxGIVdUZMTmDjrLCoXP6q4sEtRbR07KIJsQkJcxyg5GIcFKCn2HQjAmJD+T Ey48MsiS0hT+JUsVUqo+/3gKVD3r0ydwv5STK1ZvliDMPPPKp6MjHHxDMMJ+VUvBJqtM XskD6vXq71LUde1p5EFcYt5Yu9cxPbTPT4nVYU5I4bwteNrL5SLcy5TsxFtZD9dkAm18 fjhA== X-Gm-Message-State: AO0yUKXinDe23fLQlMNlJg6PGzDvkeiBFXh3zfj9NdQhvDrWhPepNHmX Y/4sKfas/jS1vIXDvJJuQd26 X-Google-Smtp-Source: AK7set+rYbeNEtZ+aa+1XveT3wxMGXe7Dl4VU/1xTlyA4s2n9sf82uFQksWhx7sT7PuUx8dM8FJdQw== X-Received: by 2002:a05:600c:a53:b0:3da:2032:6c0f with SMTP id c19-20020a05600c0a5300b003da20326c0fmr3596871wmq.31.1675171285716; Tue, 31 Jan 2023 05:21:25 -0800 (PST) Received: from platypus.lan ([2001:861:5e4c:3bb0:6424:328a:1734:3249]) by smtp.gmail.com with ESMTPSA id l16-20020a7bc350000000b003d9aa76dc6asm22401157wmj.0.2023.01.31.05.21.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 05:21:25 -0800 (PST) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen , philberty Subject: [COMMITTED] gccrs: ast: Add better assertion on AST fragments Date: Tue, 31 Jan 2023 14:25:10 +0100 Message-Id: <20230131132510.661917-1-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: gcc/rust/ChangeLog: * ast/rust-ast.h: Improve assertions within ASTFragment API. Co-authored-by: philberty Tested on x86_64-pc-linux-gnu, committed on master. --- 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 58fe2674479..9e1b8b11373 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 (); } -- 2.39.1