always use field names as base for enum names

Author: burrbull

src/config.rs

@@ -33,6 +33,7 @@ pub struct Config {
     pub reexport_interrupt: bool,
     pub ident_formats: IdentFormats,
     pub ident_formats_theme: Option<IdentFormatsTheme>,
+    pub field_names_for_enums: bool,
     pub base_address_shift: u64,
 }
 

src/generate/register.rs

@@ -756,7 +756,11 @@ pub fn fields(
                 // get the type of value structure. It can be generated from either name field
                 // in enumeratedValues if it's an enumeration, or from field name directly if it's not.
                 let value_read_ty = ident(
-                    ev.values().name.as_deref().unwrap_or(&name),
+                    if config.field_names_for_enums {
+                        &name
+                    } else {
+                        ev.values().name.as_deref().unwrap_or(&name)
+                    },
                     config,
                     fmt,
                     span,
@@ -909,7 +913,16 @@ pub fn fields(
                         }
                     }
                     EV::Derived(_, base) => {
-                        let base_ident = ident(&base.name, config, fmt, span);
+                        let base_ident = if config.field_names_for_enums {
+                            ident(
+                                &util::replace_suffix(&base.field().name, ""),
+                                config,
+                                fmt,
+                                span,
+                            )
+                        } else {
+                            ident(&base.name, config, fmt, span)
+                        };
                         if !derives.contains(&value_read_ty) {
                             let base_path = base_syn_path(base, &fpath, &base_ident, config)?;
                             mod_items.extend(quote! {
@@ -1096,7 +1109,11 @@ pub fn fields(
                     fmt = "enum_name";
                 };
                 let value_write_ty = ident(
-                    ev.values().name.as_deref().unwrap_or(&name),
+                    if config.field_names_for_enums {
+                        &name
+                    } else {
+                        ev.values().name.as_deref().unwrap_or(&name)
+                    },
                     config,
                     fmt,
                     span,
@@ -1164,8 +1181,16 @@ pub fn fields(
                         }
                     }
                     EV::Derived(_, base) => {
-                        let base_ident = ident(&base.name, config, fmt, span);
-
+                        let base_ident = if config.field_names_for_enums {
+                            ident(
+                                &util::replace_suffix(&base.field().name, ""),
+                                config,
+                                fmt,
+                                span,
+                            )
+                        } else {
+                            ident(&base.name, config, fmt, span)
+                        };
                         if rwenum.generate_write_enum() && !derives.contains(&value_write_ty) {
                             let base_path = base_syn_path(base, &fpath, &base_ident, config)?;
                             mod_items.extend(quote! {

src/main.rs

@@ -172,10 +172,18 @@ Allowed cases are `unchanged` (''), `pascal` ('p'), `constant` ('c') and `snake`
         .arg(
             Arg::new("ident_formats_theme")
                 .long("ident-formats-theme")
+                .alias("ident_formats_theme")
                 .help("A set of `ident_format` settings. `new` or `legacy`")
                 .action(ArgAction::Set)
                 .value_name("THEME"),
         )
+        .arg(
+            Arg::new("field_names_for_enums")
+                .long("field-names-for-enums")
+                .alias("field_names_for_enums")
+                .action(ArgAction::SetTrue)
+                .help("Use field name for enumerations even when enumeratedValues has a name"),
+        )
         .arg(
             Arg::new("max_cluster_size")
                 .long("max-cluster-size")