kirigaya/sv-parser
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix include with comment error

Browse Source
This commit is contained in:
dalance 2021-03-05 15:06:12 +09:00
parent ed1f86f7d3
commit b23e9079e9
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## [Unreleased](https://github.com/dalance/sv-parser/compare/v0.11.0...Unreleased) - ReleaseDate
* [Fixed] include with comment error
## [v0.11.0](https://github.com/dalance/sv-parser/compare/v0.10.8...v0.11.0) - 2021-03-04
* [Changed] keep directives after preprocess

46
sv-parser-pp/src/preprocess.rs
View File

@ -247,7 +247,10 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
}
NodeEvent::Leave(RefNode::SourceDescriptionNotDirective(x)) => {
let locate: Locate = x.try_into().unwrap();
last_item_line = Some(locate.line);
// If the item is whitespace, last_item_line should not be updated
if !locate.str(s).trim().is_empty() {
last_item_line = Some(locate.line);
}
}
NodeEvent::Leave(RefNode::CompilerDirective(x)) => {
let locate: Locate = x.try_into().unwrap();
@ -1294,4 +1297,45 @@ endmodule
);
assert_eq!(ret.origin(70).unwrap().1, 50);
}
#[test]
fn test20() {
let include_paths = [get_testcase("")];
let (ret, _) = preprocess(
get_testcase("test20.sv"),
&HashMap::new(),
&include_paths,
false,
false,
)
.unwrap();
assert_eq!(
ret.text(),
r##"module and_op (a, b, c);
// a
output a;
input b, c;
and a1 (a,b,c);
endmodule
"##
);
assert_eq!(
ret.origin(10).unwrap().0,
&PathBuf::from(get_testcase("test20.sv"))
);
assert_eq!(ret.origin(10).unwrap().1, 10);
assert_eq!(
ret.origin(60).unwrap().0,
&PathBuf::from(get_testcase("test2.svh"))
);
assert_eq!(ret.origin(60).unwrap().1, 74);
assert_eq!(
ret.origin(80).unwrap().0,
&PathBuf::from(get_testcase("test20.sv"))
);
assert_eq!(ret.origin(80).unwrap().1, 60);
}
}