From 84869bbd67bbd8b26e7c799b308923daffa63964 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Mon, 30 Jun 2025 15:19:18 -0700 Subject: [PATCH] Switch enum grammar to use "variant" This switches the grammar for enum to use the term "variant" instead of "item". "item" already has a specific meaning, and I think this unnecessarily overloads it. Also, the text never uses this phrasing (it only uses variant). --- src/items/enumerations.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/items/enumerations.md b/src/items/enumerations.md index 321d51ce2..bc79d2def 100644 --- a/src/items/enumerations.md +++ b/src/items/enumerations.md @@ -4,19 +4,19 @@ r[items.enum] r[items.enum.syntax] ```grammar,items Enumeration -> - `enum` IDENTIFIER GenericParams? WhereClause? `{` EnumItems? `}` + `enum` IDENTIFIER GenericParams? WhereClause? `{` EnumVariants? `}` -EnumItems -> EnumItem ( `,` EnumItem )* `,`? +EnumVariants -> EnumVariant ( `,` EnumVariant )* `,`? -EnumItem -> +EnumVariant -> OuterAttribute* Visibility? - IDENTIFIER ( EnumItemTuple | EnumItemStruct )? EnumItemDiscriminant? + IDENTIFIER ( EnumVariantTuple | EnumVariantStruct )? EnumVariantDiscriminant? -EnumItemTuple -> `(` TupleFields? `)` +EnumVariantTuple -> `(` TupleFields? `)` -EnumItemStruct -> `{` StructFields? `}` +EnumVariantStruct -> `{` StructFields? `}` -EnumItemDiscriminant -> `=` Expression +EnumVariantDiscriminant -> `=` Expression ``` r[items.enum.intro]