Merge PR oxibus#15: Deduplicate Value Names

Author: jannes922

src/parser.rs

@@ -2,7 +2,7 @@
 //! Module containing nom parser combinators
 //!
 
-use std::str;
+use std::{collections::HashMap, str};
 
 use nom::{
     branch::{alt, permutation},
@@ -1755,6 +1755,35 @@ fn signal_groups(s: &str) -> IResult<&str, SignalGroups> {
     ))
 }
 
+fn deduplicate_value_description_names(
+    mut value_descriptions: Vec<ValueDescription>,
+) -> Vec<ValueDescription> {
+    for desc in &mut value_descriptions {
+        if let ValueDescription::Signal {
+            message_id: _,
+            signal_name: _,
+            value_descriptions,
+        } = desc
+        {
+            let mut name_count = HashMap::<String, i32>::new();
+
+            for val_desc in value_descriptions {
+                let count_entry = name_count.entry(val_desc.b.clone()).or_default();
+                *count_entry += 1;
+
+                if *count_entry > 1 {
+                    let mut old_name = String::new();
+                    std::mem::swap(&mut val_desc.b, &mut old_name);
+
+                    val_desc.b = format!("{old_name}{count_entry}")
+                }
+            }
+        }
+    }
+
+    value_descriptions
+}
+
 pub fn dbc(s: &str) -> IResult<&str, DBC> {
     let (
         s,
@@ -1818,7 +1847,7 @@ pub fn dbc(s: &str) -> IResult<&str, DBC> {
             attribute_definitions,
             attribute_defaults,
             attribute_values,
-            value_descriptions,
+            value_descriptions: deduplicate_value_description_names(value_descriptions),
             signal_type_refs,
             signal_groups,
             signal_extended_value_type_list,