Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ast: Add EnumItem::Kind #3342

Merged
merged 1 commit into from
Jan 3, 2025
Merged

ast: Add EnumItem::Kind #3342

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions gcc/rust/ast/rust-item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1994,6 +1994,41 @@ class EnumItem : public VisItem
location_t locus;

public:
enum class Kind
{
Identifier,
Tuple,
Struct,

// FIXME: In the future, we'll need to remove this possibility as well as
// remove the EnumItemDiscriminant class. The feature for arbitrary
// discriminants on all kinds of variants has been stabilized, and a
// "discriminant" is no longer an enum item variant - it's simply an
// optional part of all variants.
//
// Per the reference:
//
// EnumItem :
// OuterAttribute* Visibility?
// IDENTIFIER ( EnumItemTuple | EnumItemStruct )? EnumItemDiscriminant?
//
// EnumItemTuple :
// ( TupleFields? )
//
// EnumItemStruct :
// { StructFields? }
//
// EnumItemDiscriminant :
// = Expression
//
// So we instead need to remove the class, and add an optional expression to
// the base EnumItem class
//
// gccrs#3340

Discriminant,
};

virtual ~EnumItem () {}

EnumItem (Identifier variant_name, Visibility vis,
Expand All @@ -2002,6 +2037,8 @@ class EnumItem : public VisItem
variant_name (std::move (variant_name)), locus (locus)
{}

virtual Kind get_enum_item_kind () const { return Kind::Identifier; }

// Unique pointer custom clone function
std::unique_ptr<EnumItem> clone_enum_item () const
{
Expand Down Expand Up @@ -2043,6 +2080,11 @@ class EnumItemTuple : public EnumItem
tuple_fields (std::move (tuple_fields))
{}

EnumItem::Kind get_enum_item_kind () const override
{
return EnumItem::Kind::Tuple;
}

std::string as_string () const override;

void accept_vis (ASTVisitor &vis) override;
Expand Down Expand Up @@ -2080,6 +2122,11 @@ class EnumItemStruct : public EnumItem
struct_fields (std::move (struct_fields))
{}

EnumItem::Kind get_enum_item_kind () const override
{
return EnumItem::Kind::Struct;
}

std::string as_string () const override;

void accept_vis (ASTVisitor &vis) override;
Expand Down Expand Up @@ -2133,6 +2180,11 @@ class EnumItemDiscriminant : public EnumItem
EnumItemDiscriminant (EnumItemDiscriminant &&other) = default;
EnumItemDiscriminant &operator= (EnumItemDiscriminant &&other) = default;

EnumItem::Kind get_enum_item_kind () const override
{
return EnumItem::Kind::Discriminant;
}

std::string as_string () const override;

void accept_vis (ASTVisitor &vis) override;
Expand Down
Loading