From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by sourceware.org (Postfix) with ESMTPS id D51B73857365 for ; Fri, 21 Mar 2025 12:37:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D51B73857365 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 D51B73857365 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::333 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742560629; cv=none; b=dmgsHb3rMkHbo8+z18/7Q62PhVUkwDC8FkVneDAQp7Q3lhUGJMSLPC6fvR//1f2k2NyOoWKWpOoYVX2E/4uaZ9FnAX8DiHHIBRV3W7WBAU7uF8cC+lFKZJMJqPklsqtDLBxJUcwaP/hTN9EBgs0aIt2ENc4/YcCqSFzsgrAzN3E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1742560629; c=relaxed/simple; bh=Soacavy35sSHaKUucIdOKrRJaGCRkw3fWyE9FZTSnlg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=leL+AndCjNwoNOGkG03ezygJlfQ+dMMD7MhRfdfDiqff9Gr6rqfM0qmZ6I3O9ASOl2Xky7vmwBJDV8Yyst2bE8qJQOvwrNPpIT3aRDLH6SVC/vsgj3tkCbiser+nFC+dKP9cTDoy/LABOJVPb+d6cX+3frBhIvFzvWky7S34D9I= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso17100465e9.1 for ; Fri, 21 Mar 2025 05:37:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1742560475; x=1743165275; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UUblXATv8XDaoq9jmlxStPW7PDGCbnOust1tPlt6ub8=; b=hhKpYNag9sskx/PpoUHGMho4uKaUuq1tFQz1qwWd3QpDij+qbtvDtfrV2cDHTxq0Zy BQD3v0xozcQTo8Tb1rmoVMIZ8B68kE+4ykX/O70NiWhw0KBcpjdJxBdwBCf67tOQtmBf nCU9wHiA3MQVrVFsMfJqFfAB//NmBHSP3KtoVe1r7LRrJoa76NbRat4yDF9RaV1IAG1r CK9NYI6asTQSFcefhr86xcrTYLzVXUhdtuxjAYmjpb1oxu+rkHG8klcVl6yIUcP7jTPL PPxzQn1azqRGHYRjAClmB+pq/icbGyKvUM49YnQMMZEj8ukCWVMHWL+2jpIfTUF5Ewyi Csrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742560475; x=1743165275; h=content-transfer-encoding:mime-version: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=UUblXATv8XDaoq9jmlxStPW7PDGCbnOust1tPlt6ub8=; b=a5IGWuX/lGUd13xBe43SbbteINiGP+jJ2TSsjB+qnFGzNCmNJy2HKZlAh99h23j6XA Pc2OzTJceiTa4oqjKITodf7cQ/2fyxQBD4ORieGzDjxczAxH8LhRexzlH9krsNeusN1f MkjdZbhafeS0aMm6RKeuTElyjJAHcqA/ksnz1gT8BjnW/S70LPmQWkBMUEBHtyj+uXcw lffA5JoQMyC+dkuEX0xyEMCgWOYFwbMYvUxUFuj0rWf5/TPbp0WDi8U86FDE4RYHK5l4 nVyVFYBrq806uOv13FQYvK2YNei/LvmctP8MBF5Fz4feW0Kd2rDnByOR/AZWzp8ERec8 C2vg== X-Gm-Message-State: AOJu0YzqSNohV48q1jRYHfJnyVKmtfH9nSsIAOgipTU4BhlUc+sI0zeu nfvL+KLFQhm4lw81hJiP4vEgG6DnqgVYU+GVEG3HunOeYgJy5t91u1aHCdF6e+nGVmpEXDwa5mI Y3g== X-Gm-Gg: ASbGncsNn1RICRe3HHXWTXQ4QMN9ZZ6uB6yaAvu7z/7bgG24j5B/8BtFXQM3BdMXdNw lmBk+l1ornLStvSkmGQrEpX0UE9PsWmJA7tSaQh5u6rYVDH3OEK58LJG+a4tU7P+8t2CwvLpjy+ h8FG4MMcxerIRFVbv7HV34xR+gJm5cBxOXp8dRXgYPJdhrbmfCTMGs5+S5pMVP7/MsD2HaLUtp6 NgimeVCMMdGotlyZb/yy+LfBXRPaJXckYi259/t48gz1GHFPvZHaVB/vSRZQKrZmUMkrndBceuS Nvg77fUpucyG0E/dqpUkQOMaC3ONXcwPyXnlGNR79hXcf6xRm+W0d8hi X-Google-Smtp-Source: AGHT+IHUeSHG01gMWNwTo/aySswDJ8wTc72V1eY75yspiPJxVs0XKezxDVQXQG+ETGYrBWhZ5lYLeA== X-Received: by 2002:a05:600c:5849:b0:43c:f81d:f with SMTP id 5b1f17b1804b1-43d52a2068emr12525665e9.8.1742560474683; Fri, 21 Mar 2025 05:34:34 -0700 (PDT) Received: from platypus.lan ([2a04:cec0:1901:7a99:be55:efb3:1ec6:8ea7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d440ed4d9sm76950305e9.33.2025.03.21.05.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 05:34:34 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 141/146] gccrs: derive(Clone): Add deriving of simple enum variants Date: Fri, 21 Mar 2025 13:07:22 +0100 Message-ID: <20250321123226.184882-142-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250321123226.184882-1-arthur.cohen@embecosm.com> References: <20250321123226.184882-1-arthur.cohen@embecosm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.4 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=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: Arthur Cohen gcc/rust/ChangeLog: * expand/rust-derive-clone.cc: Clone enum identifier variants properly * expand/rust-derive-clone.h: Declare new functions used. --- gcc/rust/expand/rust-derive-clone.cc | 52 ++++++++++++++++++++++++++-- gcc/rust/expand/rust-derive-clone.h | 3 ++ 2 files changed, 53 insertions(+), 2 deletions(-) diff --git a/gcc/rust/expand/rust-derive-clone.cc b/gcc/rust/expand/rust-derive-clone.cc index b8c92dcc6fe..e4702d8a818 100644 --- a/gcc/rust/expand/rust-derive-clone.cc +++ b/gcc/rust/expand/rust-derive-clone.cc @@ -20,6 +20,7 @@ #include "rust-ast.h" #include "rust-ast-dump.h" #include "rust-item.h" +#include "rust-path.h" namespace Rust { namespace AST { @@ -235,11 +236,58 @@ DeriveClone::visit_struct (StructStruct &item) item.get_generic_params ()); } +MatchCase +DeriveClone::clone_enum_identifier (Enum &item, + const std::unique_ptr &variant) +{ + auto variant_path = PathInExpression ( + {builder.path_segment (item.get_identifier ().as_string ()), + builder.path_segment (variant->get_identifier ().as_string ())}, + {}, loc, false); + + auto pattern = std::unique_ptr (new ReferencePattern ( + std::unique_ptr (new PathInExpression (variant_path)), false, + false, loc)); + auto expr = std::unique_ptr (new PathInExpression (variant_path)); + + return builder.match_case (std::move (pattern), std::move (expr)); +} + void DeriveClone::visit_enum (Enum &item) { - rust_sorry_at (item.get_locus (), "cannot derive %qs for these items yet", - "Clone"); + // Create an arm for each variant of the enum + // For enum item variants, just create the same variant + // For struct and tuple variants, destructure the pattern and call clone for + // each field + + auto cases = std::vector (); + + for (const auto &variant : item.get_variants ()) + { + switch (variant->get_enum_item_kind ()) + { + // Identifiers and discriminated variants are the same for a clone - we + // just return the same variant + case EnumItem::Kind::Identifier: + case EnumItem::Kind::Discriminant: + cases.emplace_back (clone_enum_identifier (item, variant)); + break; + case EnumItem::Kind::Tuple: + case EnumItem::Kind::Struct: + rust_unreachable (); + break; + } + } + + // match self { ... } + auto match = builder.match (builder.identifier ("self"), std::move (cases)); + + expanded = clone_impl (clone_fn (std::move (match)), + item.get_identifier ().as_string (), + item.get_generic_params ()); + + AST::Dump::debug (*expanded); } void diff --git a/gcc/rust/expand/rust-derive-clone.h b/gcc/rust/expand/rust-derive-clone.h index 4a43b2ac1fc..339cf6357ae 100644 --- a/gcc/rust/expand/rust-derive-clone.h +++ b/gcc/rust/expand/rust-derive-clone.h @@ -63,6 +63,9 @@ private: clone_impl (std::unique_ptr &&clone_fn, std::string name, const std::vector> &type_generics); + MatchCase clone_enum_identifier (Enum &item, + const std::unique_ptr &variant); + virtual void visit_struct (StructStruct &item); virtual void visit_tuple (TupleStruct &item); virtual void visit_enum (Enum &item); -- 2.45.2