remove EnumVariat::name from DSL v2 (#697)

Since it is no longer needed after enums were simplified in #610. We can just use the referenced item name directly.
NomicFoundation · Dec 6, 2023 · 7a3c1fb · 7a3c1fb
1 parent 64233cb
commit 7a3c1fb
Show file tree

Hide file tree

Showing 7 changed files with 222 additions and 357 deletions.
diff --git a/crates/codegen/language/definition/src/compiler/analysis/definitions.rs b/crates/codegen/language/definition/src/compiler/analysis/definitions.rs
@@ -51,9 +51,11 @@ fn check_enum_items(analysis: &mut Analysis) {
         let mut variants = HashSet::new();
 
         for variant in &item.variants {
-            let name = &variant.name;
-            if !variants.insert(&**name) {
-                analysis.errors.add(name, &Errors::ExistingVariant(name));
+            let reference = &variant.reference;
+            if !variants.insert(&**reference) {
+                analysis
+                    .errors
+                    .add(reference, &Errors::ExistingVariant(reference));
             }
         }
     }
@@ -165,7 +167,7 @@ fn calculate_defined_in(analysis: &mut Analysis, item: &SpannedItem) -> VersionS
 enum Errors<'err> {
     #[error("An item with the name '{0}' already exists.")]
     ExistingItem(&'err Identifier),
-    #[error("A variant with the name '{0}' already exists.")]
+    #[error("A variant referencing '{0}' already exists.")]
     ExistingVariant(&'err Identifier),
     #[error("An expression with the name '{0}' already exists.")]
     ExistingExpression(&'err Identifier),

diff --git a/crates/codegen/language/definition/src/compiler/analysis/references.rs b/crates/codegen/language/definition/src/compiler/analysis/references.rs
@@ -93,11 +93,7 @@ fn check_enum(analysis: &mut Analysis, item: &SpannedEnumItem, enablement: &Vers
     let enablement = update_enablement(analysis, enablement, enabled);
 
     for variant in variants {
-        let SpannedEnumVariant {
-            name: _,
-            enabled,
-            reference,
-        } = variant;
+        let SpannedEnumVariant { reference, enabled } = variant;
 
         let enablement = update_enablement(analysis, &enablement, enabled);
 

diff --git a/crates/codegen/language/definition/src/model/non_terminals/enum_.rs b/crates/codegen/language/definition/src/model/non_terminals/enum_.rs
@@ -15,9 +15,7 @@ pub struct EnumItem {
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[derive_spanned_type(ParseInputTokens, WriteOutputTokens)]
 pub struct EnumVariant {
-    pub name: Identifier,
+    pub reference: Identifier,
 
     pub enabled: Option<VersionSpecifier>,
-
-    pub reference: Identifier,
 }
diff --git a/crates/codegen/language/tests/src/fail/definitions/duplicate_variant_name/test.rs b/crates/codegen/language/tests/src/fail/definitions/duplicate_variant_name/test.rs
@@ -14,14 +14,18 @@ codegen_language_macros::compile!(Language(
                 Enum(
                     name = Bar,
                     variants = [
-                        EnumVariant(name = Variant1, reference = Baz),
-                        EnumVariant(name = Variant2, reference = Baz),
-                        EnumVariant(name = Variant1, reference = Baz)
+                        EnumVariant(reference = Baz1),
+                        EnumVariant(reference = Baz2),
+                        EnumVariant(reference = Baz1)
                     ]
                 ),
                 Token(
-                    name = Baz,
-                    definitions = [TokenDefinition(scanner = Atom("baz"))]
+                    name = Baz1,
+                    definitions = [TokenDefinition(scanner = Atom("baz1"))]
+                ),
+                Token(
+                    name = Baz2,
+                    definitions = [TokenDefinition(scanner = Atom("baz2"))]
                 )
             ]
         )]

diff --git a/crates/codegen/language/tests/src/fail/definitions/duplicate_variant_name/test.stderr b/crates/codegen/language/tests/src/fail/definitions/duplicate_variant_name/test.stderr
@@ -1,5 +1,5 @@
-error: A variant with the name 'Variant1' already exists.
-  --> src/fail/definitions/duplicate_variant_name/test.rs:19:44
+error: A variant referencing 'Baz1' already exists.
+  --> src/fail/definitions/duplicate_variant_name/test.rs:19:49
    |
-19 |                         EnumVariant(name = Variant1, reference = Baz)
-   |                                            ^^^^^^^^
+19 |                         EnumVariant(reference = Baz1)
+   |                                                 ^^^^