From e7f2f661dfad09a833ebe11f145768da07475573 Mon Sep 17 00:00:00 2001
From: TheZoq2 <frans.skarman@protonmail.com>
Date: Thu, 5 Oct 2023 17:57:06 +0200
Subject: [PATCH] Separate name from width

---
 src/vcd/parse/scopes.rs |  3 +++
 src/vcd/signal.rs       | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/vcd/parse/scopes.rs b/src/vcd/parse/scopes.rs
index 9931cbd..5da96ea 100644
--- a/src/vcd/parse/scopes.rs
+++ b/src/vcd/parse/scopes.rs
@@ -126,10 +126,12 @@ pub(super) fn parse_var<R: std::io::Read>(
     // $var parameter 3 a IDLE $end
     //                    ^^^^ - full_signal_name(can extend until $end)
     let mut full_signal_name = Vec::<String>::new();
+    let mut size = None;
     loop {
         let (word, _) = next_word!(word_reader)?;
         match word {
             "$end" => break,
+            other if other.starts_with('[') => size = Some(other.to_string()),
             _ => full_signal_name.push(word.to_string()),
         }
     }
@@ -170,6 +172,7 @@ pub(super) fn parse_var<R: std::io::Read>(
                     .chain([full_signal_name])
                     .collect::<Vec<String>>(),
                 signal_type: var_type,
+                index: size,
                 signal_error: None,
                 num_bits,
                 num_bytes,
diff --git a/src/vcd/signal.rs b/src/vcd/signal.rs
index d0dc9b5..541221e 100644
--- a/src/vcd/signal.rs
+++ b/src/vcd/signal.rs
@@ -48,6 +48,11 @@ impl<'a> Signal<'a> {
         signal_enum.name()
     }
 
+    pub fn name_with_size(&self) -> String {
+        let Signal(signal_enum) = &self;
+        signal_enum.name_with_index()
+    }
+
     pub fn path(&self) -> &[String] {
         match self.0 {
             SignalEnum::Data { path, .. } => path,
@@ -135,6 +140,9 @@ pub(super) enum SignalEnum {
         name: String,
         path: Vec<String>,
         signal_type: SignalType,
+        /// The optional [start:end] part of the signal name that is sometimes
+        /// added to signals
+        index: Option<String>,
         /// I've seen a 0 bit signal parameter in a xilinx
         /// simulation before that gets assigned 1 bit values.
         /// I consider this to be bad behavior. We capture such
@@ -218,6 +226,20 @@ impl SignalEnum {
         }
         .clone()
     }
+
+    pub fn name_with_index(&self) -> String {
+        match self {
+            SignalEnum::Data {
+                name, index: None, ..
+            } => format!("{name}"),
+            SignalEnum::Data {
+                name,
+                index: Some(size),
+                ..
+            } => format!("{name} {size}"),
+            SignalEnum::Alias { name, .. } => name.clone(),
+        }
+    }
 }
 
 // helper functions ultimately used by Signal's query functions later on
-- 
2.47.1