From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by sourceware.org (Postfix) with ESMTPS id 15B03385842F for ; Tue, 30 Jan 2024 12:11:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 15B03385842F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 15B03385842F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616707; cv=none; b=TngmyX2x5CUPOL/E9usi7FpQJKKLzkzKlecMnseKj6mZL7NnIJIemqgBZN4bvUa1Xk+4DmQ21kabtLYAXc91EqO0VW9LHJmgLGNCYyT4bj3O9IIw07hCAA1MXcanaBrHbUGVUwnefmwUDCnsBXiQ4XHKbIbbvxWt0a4SBmLdwDU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616707; c=relaxed/simple; bh=yPKXpPxnOQTpbHUDamMl/Ml582TbJ6WIuLmAB5cbXaM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=FrpVu3qdA2tLg9/GtVwo6LKOQoNa2bvso/j3J2TQNSstFwViEA8/mc5u+fqcgXkZFGUUiER/MgRwQXmMh+jGagMKKQg91IzD/dv0rw7k/Rt0+JlPaahofssTIip2/v3BGHH1cwWLLhJkqMoD8ReMeI43SWJTD9iVZAFrdbGqA4Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40eccf4a91dso42219165e9.2 for ; Tue, 30 Jan 2024 04:11:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616683; x=1707221483; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=F073MiJkCiGqDD6228no/Xdl2CrJSgpaQ9S47fRZZgE=; b=JcaZb38klQWwm4rPDPUbxcwOZ38II34de3Kmg3d6tV3caMDYWt73v5wJU5ekv7200s f/Th+LqT/TcY18DErUFBU0nIIEN2EbDrd8Sn0Zqsz6rD4rwqIwDTbCmn3JoVxtj5R+v0 EHWvyjskc3Xb0LQH2XYI+qw92LyVO7eAel3MtECZ/nEOP5sT1Rt8IRK86Yb2qUheeXqF fjlPAcdLOGCPIbc8RdAR9ykgjXOILIc29lebdqMzG7+fJHbUUcbrLN8EKZbVS5nOhEal 48A8pIqM65ZWVszALgbnlgtt2Ge6WZA8EO0zPXhaewLRGIQiKG/196KMoOE7lyIuibz0 uiqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616683; x=1707221483; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=F073MiJkCiGqDD6228no/Xdl2CrJSgpaQ9S47fRZZgE=; b=naGi/nJPVNNjbtMgKOIpDPYmL6SHU9SrUCozR5qYfxeLVGD1cVXZZ/R/i1IEULGis2 Q9xJ5aafkSQtEsjMZS72eRBWqZzSnVi+PGb7aBy/33OB/5t0IB3lG6dax3koUiFlg5rW 7kkpNZ/Wk9mEfEmWbFaMallAwlO678+i0HjdvB/dM4lY3eufEHiMN6BttSkLBw+Sjs7h YK1LeH4VP3IBok+8+EKbluvVlFvkUNnwQ2BecUKAMtuYet9o/FNCa1AvcWKDqS8ZIKNZ /RZfGo3NDRKVzi5V0nuVSlR1S+x607qMr2vIDzKK24HXhJ6lE28v3Jo8CGw9J3ZeVdLw Cfpg== X-Gm-Message-State: AOJu0Yx8NzrOOaW00G8F/q1hyJR+R859tIijFheF4Mkwoc7oLlQYQVy5 O/DuPRaAzKPvxvM86qSAhWy9K4GKTIlkVu8+xbRYJ5N/iSwI2VZLAeBubxTs7w== X-Google-Smtp-Source: AGHT+IHz/5/6KdgPJTAmPzQVF2RZp1ZWSGwOYhyKaQmrq90MYrtZmYhdJWJQVHZEzcGFEDB3KRoYbA== X-Received: by 2002:a05:600c:4fce:b0:40e:fc23:4010 with SMTP id o14-20020a05600c4fce00b0040efc234010mr2502711wmq.12.1706616682908; Tue, 30 Jan 2024 04:11:22 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:22 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [COMMITTED 044/101] gccrs: Create base class for TupleStructItems and TuplePatternItems Date: Tue, 30 Jan 2024 13:07:00 +0100 Message-ID: <20240130121026.807464-47-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.2 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,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Owen Avery gcc/rust/ChangeLog: * hir/tree/rust-hir-pattern.h (class TupleItems): New. (class TupleStructItems): Inherit from TupleItems. (class TuplePatternItems): Likewise. Signed-off-by: Owen Avery --- gcc/rust/hir/tree/rust-hir-pattern.h | 47 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h index 33025bfdb6b..e65a62f20a8 100644 --- a/gcc/rust/hir/tree/rust-hir-pattern.h +++ b/gcc/rust/hir/tree/rust-hir-pattern.h @@ -777,8 +777,8 @@ protected: } }; -// Base abstract class for patterns used in TupleStructPattern -class TupleStructItems : public FullVisitable +// Base abstract class for TupleStructItems and TuplePatternItems +class TupleItems : public FullVisitable { public: enum ItemType @@ -787,25 +787,38 @@ public: RANGED, }; - virtual ~TupleStructItems () {} + virtual ~TupleItems () {} // TODO: should this store location data? // Unique pointer custom clone function - std::unique_ptr clone_tuple_struct_items () const + std::unique_ptr clone_tuple_items () const { - return std::unique_ptr (clone_tuple_items_impl ()); + return std::unique_ptr (clone_tuple_items_impl ()); } + virtual ItemType get_item_type () const = 0; + virtual std::string as_string () const = 0; - virtual void accept_vis (HIRFullVisitor &vis) = 0; +protected: + // pure virtual clone implementation + virtual TupleItems *clone_tuple_items_impl () const = 0; +}; - virtual ItemType get_item_type () const = 0; +// Base abstract class for patterns used in TupleStructPattern +class TupleStructItems : public TupleItems +{ +public: + // Unique pointer custom clone function + std::unique_ptr clone_tuple_struct_items () const + { + return std::unique_ptr (clone_tuple_items_impl ()); + } protected: // pure virtual clone implementation - virtual TupleStructItems *clone_tuple_items_impl () const = 0; + virtual TupleStructItems *clone_tuple_items_impl () const override = 0; }; // Class for non-ranged tuple struct pattern patterns @@ -1011,32 +1024,18 @@ protected: }; // Base abstract class representing TuplePattern patterns -class TuplePatternItems : public FullVisitable +class TuplePatternItems : public TupleItems { public: - enum ItemType - { - MULTIPLE, - RANGED, - }; - - virtual ~TuplePatternItems () {} - - // TODO: should this store location data? - // Unique pointer custom clone function std::unique_ptr clone_tuple_pattern_items () const { return std::unique_ptr (clone_tuple_items_impl ()); } - virtual std::string as_string () const = 0; - - virtual ItemType get_item_type () const = 0; - protected: // pure virtual clone implementation - virtual TuplePatternItems *clone_tuple_items_impl () const = 0; + virtual TuplePatternItems *clone_tuple_items_impl () const override = 0; }; // Class representing TuplePattern patterns where there are multiple patterns -- 2.42.1