Yehowshua/FastWaveBackend
Archived
1
0
Fork 0
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions

change visibility of and rename Signal to SignalEnum

Browse source
This commit is contained in:
Yehowshua Immanuel 2022-10-25 21:32:22 -04:00
parent 6abcd7ce32
commit 746c25b1ba
4 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/vcd/parse/events.rs
View file

@ -116,7 +116,7 @@ pub(super) fn parse_events<'a>(
let signal = vcd.dealiasing_signal_idx_to_signal_lookup_mut(signal_idx)?;
match signal {
Signal::Data {
SignalEnum::Data {
name,
sig_type,
ref mut signal_error,
@ -204,7 +204,7 @@ pub(super) fn parse_events<'a>(
Ok(())
}
}
Signal::Alias { .. } => {
SignalEnum::Alias { .. } => {
let (f, l) = (file!(), line!());
let msg = format!(
"Error near {f}:{l}, a signal alias should not point to a signal alias.\n\
@ -229,7 +229,7 @@ pub(super) fn parse_events<'a>(
let signal = vcd.dealiasing_signal_idx_to_signal_lookup_mut(signal_idx)?;
match signal {
Signal::Data {
SignalEnum::Data {
name,
sig_type,
ref mut signal_error,
@ -296,7 +296,7 @@ pub(super) fn parse_events<'a>(
}
Ok(())
}
Signal::Alias { .. } => {
SignalEnum::Alias { .. } => {
let (f, l) = (file!(), line!());
let msg = format!(
"Error near {f}:{l}, a signal alias should not point to a signal alias.\n\
@ -320,7 +320,7 @@ pub(super) fn parse_events<'a>(
let signal = vcd.dealiasing_signal_idx_to_signal_lookup_mut(signal_idx)?;
match signal {
Signal::Data {
SignalEnum::Data {
name,
sig_type,
ref mut signal_error,
@ -387,7 +387,7 @@ pub(super) fn parse_events<'a>(
}
Ok(())
}
Signal::Alias { .. } => {
SignalEnum::Alias { .. } => {
let (f, l) = (file!(), line!());
let msg = format!(
"Error near {f}:{l}, a signal alias should not point to a signal alias.\n\
@ -413,7 +413,7 @@ pub(super) fn parse_events<'a>(
let signal = vcd.dealiasing_signal_idx_to_signal_lookup_mut(signal_idx)?;
match signal {
Signal::Data {
SignalEnum::Data {
name,
sig_type,
ref mut signal_error,
@ -468,7 +468,7 @@ pub(super) fn parse_events<'a>(
string_vals.push(val);
Ok(())
}
Signal::Alias { .. } => {
SignalEnum::Alias { .. } => {
let (f, l) = (file!(), line!());
let msg = format!(
"Error near {f}:{l}, a signal alias should not point to a signal alias.\n\
@ -492,7 +492,7 @@ pub(super) fn parse_events<'a>(
let signal = vcd.dealiasing_signal_idx_to_signal_lookup_mut(signal_idx)?;
match signal {
Signal::Data {
SignalEnum::Data {
ref mut signal_error,
string_vals,
byte_len_of_string_tmstmp_vals_on_tmln,
@ -513,7 +513,7 @@ pub(super) fn parse_events<'a>(
string_vals.push(val);
Ok(())
}
Signal::Alias { .. } => {
SignalEnum::Alias { .. } => {
let (f, l) = (file!(), line!());
let msg = format!(
"Error near {f}:{l}, a signal alias should not point to a signal alias.\n\

6
src/vcd/parse/scopes.rs
View file

@ -95,7 +95,7 @@ pub(super) fn parse_var<'a>(
let full_signal_name = full_signal_name.join(" ");
let num_bytes = if num_bits.is_some() {
let bytes_required = Signal::bytes_required(num_bits.unwrap(), &full_signal_name)?;
let bytes_required = SignalEnum::bytes_required(num_bits.unwrap(), &full_signal_name)?;
Some(bytes_required)
} else {
None
@ -107,7 +107,7 @@ pub(super) fn parse_var<'a>(
let (signal, signal_idx) = match signal_map.get(&signal_alias) {
Some(ref_signal_idx) => {
let signal_idx = SignalIdx(vcd.all_signals.len());
let signal = Signal::Alias {
let signal = SignalEnum::Alias {
name: full_signal_name,
signal_alias: *ref_signal_idx,
};
@ -116,7 +116,7 @@ pub(super) fn parse_var<'a>(
None => {
let signal_idx = SignalIdx(vcd.all_signals.len());
signal_map.insert(signal_alias.to_string(), signal_idx);
let signal = Signal::Data {
let signal = SignalEnum::Data {
name: full_signal_name,
sig_type: var_type,
signal_error: None,