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

Expose stuff #8

Merged
TheZoq2 merged 6 commits from expose_stuff into main 2023-07-02 00:20:05 +00:00
Conversation 3 Commits 6 Files changed 9 +5 -5
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 53bbacd261 - Show all commits

10
src/vcd/signal.rs
View file

@ -63,7 +63,7 @@ impl<'a> Signal<'a> {
&self, &self,
desired_time: &BigUint, desired_time: &BigUint,
vcd: &types::VCD, vcd: &types::VCD,
) -> Result<SignalValue, SignalErrors> { ) -> Result<(TimeStamp, SignalValue), SignalErrors> {
let Signal(signal_enum) = &self; let Signal(signal_enum) = &self;
let num_val = signal_enum let num_val = signal_enum
.query_num_val_on_tmln( .query_num_val_on_tmln(
@ -84,14 +84,14 @@ impl<'a> Signal<'a> {
match (num_val, str_val) { match (num_val, str_val) {
(Ok((num_val, num_time)), Ok((str_val, str_time))) => { (Ok((num_val, num_time)), Ok((str_val, str_time))) => {
if num_time > str_time { if num_time > str_time {
Ok(SignalValue::BigUint(num_val)) Ok((num_time, SignalValue::BigUint(num_val)))
} }
else { else {
Ok(SignalValue::String(str_val)) Ok((str_time, SignalValue::String(str_val)))
} }
} }
(Ok((num_val, _)), Err(_)) => Ok(SignalValue::BigUint(num_val)), (Ok((num_val, time)), Err(_)) => Ok((time, SignalValue::BigUint(num_val))),
(Err(_), Ok((str_val, _))) => Ok(SignalValue::String(str_val)), (Err(_), Ok((str_val, time))) => Ok((time, SignalValue::String(str_val))),
(Err(e), _e) => Err(e) (Err(e), _e) => Err(e)
} }
} }