Add workaround for files produced by verilator which have annonymous scopes #35
|
@ -289,7 +289,10 @@ fn parse_scopes_inner<R: std::io::Read>(
|
||||||
// $scope module reg_mag_i $end
|
// $scope module reg_mag_i $end
|
||||||
// ^^^^^^^^^ - scope name
|
// ^^^^^^^^^ - scope name
|
||||||
let (scope_name, _) = next_word!(word_reader)?;
|
let (scope_name, _) = next_word!(word_reader)?;
|
||||||
|
// In some cases there are VCD files which have scopes without names.
|
||||||
|
// since these occur in the wild, we'll tolerate them even if it is unclear
|
||||||
|
// if it is supported or not by the spec.
|
||||||
|
if scope_name != "$end" {
|
||||||
let mut path = path.clone();
|
let mut path = path.clone();
|
||||||
path.push(scope_name.to_string());
|
path.push(scope_name.to_string());
|
||||||
|
|
||||||
|
@ -373,6 +376,70 @@ fn parse_scopes_inner<R: std::io::Read>(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// We'll be conservative and only allow new scopes in this case, and make the nameless
|
||||||
|
// scope completely transparent. I.e.
|
||||||
|
// $scope module a $end
|
||||||
|
// $scope module $end
|
||||||
|
// $scope module b $end
|
||||||
|
// ...
|
||||||
|
// $upscope
|
||||||
|
// $upscope
|
||||||
|
// $upscope
|
||||||
|
// will create `a.b`
|
||||||
|
loop {
|
||||||
|
let (word, cursor) = next_word!(word_reader)?;
|
||||||
|
let ParseResult { matched, residual } = tag(word, "$");
|
||||||
|
match matched {
|
||||||
|
// we hope that this word starts with a `$`
|
||||||
|
"$" => {
|
||||||
|
match residual {
|
||||||
|
"scope" => {
|
||||||
|
// recursive - parse inside of current scope tree
|
||||||
|
parse_scopes_inner(
|
||||||
|
word_reader,
|
||||||
|
parent_scope_idx,
|
||||||
|
vcd,
|
||||||
|
signal_map,
|
||||||
|
&path,
|
||||||
|
)?;
|
||||||
|
}
|
||||||
|
"upscope" => {
|
||||||
|
ident(word_reader, "$end")?;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
// we ignore comments
|
||||||
|
"comment" => loop {
|
||||||
|
if ident(word_reader, "$end").is_ok() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
let err = format!(
|
||||||
|
"Error near {}:{}. \
|
||||||
|
found keyword `{residual}` in annonyoums scope but expected \
|
||||||
|
`$scope`, `$comment`, or `$upscope` \
|
||||||
|
on {cursor:?}",
|
||||||
|
file!(),
|
||||||
|
line!()
|
||||||
|
);
|
||||||
|
return Err(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => {
|
||||||
|
let err = format!(
|
||||||
|
"Error near {}:{}. \
|
||||||
|
found keyword `{matched}` but \
|
||||||
|
expected `$` on {cursor:?}",
|
||||||
|
file!(),
|
||||||
|
line!()
|
||||||
|
);
|
||||||
|
return Err(err);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue