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

Make comment stripping optional

Browse Source
This commit is contained in:
Florian Zaruba 2020-03-19 18:42:41 +01:00
parent fa6150fc9e
commit c7c79dbcdb
3 changed files with 83 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ use sv_parser_error::Error;
use sv_parser_parser::{pp_parser, Span, SpanInfo}; use sv_parser_parser::{pp_parser, Span, SpanInfo};
use sv_parser_syntaxtree::{ use sv_parser_syntaxtree::{
IncludeCompilerDirective, Locate, NodeEvent, RefNode, SourceDescription, TextMacroUsage, IncludeCompilerDirective, Locate, NodeEvent, RefNode, SourceDescription, TextMacroUsage,
WhiteSpace,
}; };
const RECURSIVE_LIMIT: usize = 128; const RECURSIVE_LIMIT: usize = 128;
@ -119,6 +120,7 @@ pub fn preprocess<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
path: T, path: T,
pre_defines: &HashMap<String, Option<Define>, V>, pre_defines: &HashMap<String, Option<Define>, V>,
include_paths: &[U], include_paths: &[U],
strip_comments: bool,
ignore_include: bool, ignore_include: bool,
) -> Result<(PreprocessedText, Defines), Error> { ) -> Result<(PreprocessedText, Defines), Error> {
let f = File::open(path.as_ref()).map_err(|x| Error::File { let f = File::open(path.as_ref()).map_err(|x| Error::File {
@ -129,7 +131,15 @@ pub fn preprocess<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
let mut s = String::new(); let mut s = String::new();
reader.read_to_string(&mut s)?; reader.read_to_string(&mut s)?;
preprocess_str(&s, path, pre_defines, include_paths, ignore_include, 0) preprocess_str(
&s,
path,
pre_defines,
include_paths,
ignore_include,
strip_comments,
0,
)
} }
pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>( pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
@ -138,6 +148,7 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
pre_defines: &HashMap<String, Option<Define>, V>, pre_defines: &HashMap<String, Option<Define>, V>,
include_paths: &[U], include_paths: &[U],
ignore_include: bool, ignore_include: bool,
strip_comments: bool,
resolve_depth: usize, resolve_depth: usize,
) -> Result<(PreprocessedText, Defines), Error> { ) -> Result<(PreprocessedText, Defines), Error> {
let mut skip = false; let mut skip = false;
@ -284,6 +295,18 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
} }
} }
NodeEvent::Enter(RefNode::WhiteSpace(x)) if !skip && !strip_comments => {
if let WhiteSpace::Space(_) = x {
let locate: Locate = x.try_into().unwrap();
let range = Range::new(locate.offset + locate.len, locate.offset + locate.len);
ret.push(locate.str(&s), Some((path.as_ref(), range)));
}
}
NodeEvent::Enter(RefNode::Comment(x)) if !skip && !strip_comments => {
let locate: Locate = x.try_into().unwrap();
let range = Range::new(locate.offset, locate.offset + locate.len);
ret.push(locate.str(&s), Some((path.as_ref(), range)));
}
NodeEvent::Enter(RefNode::IfndefDirective(x)) if !skip => { NodeEvent::Enter(RefNode::IfndefDirective(x)) if !skip => {
let (_, _, ref ifid, ref ifbody, ref elsif, ref elsebody, _, _) = x.nodes; let (_, _, ref ifid, ref ifbody, ref elsif, ref elsebody, _, _) = x.nodes;
let ifid = identifier(ifid.into(), &s).unwrap(); let ifid = identifier(ifid.into(), &s).unwrap();
@ -391,6 +414,7 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
path.as_ref(), path.as_ref(),
&defines, &defines,
include_paths, include_paths,
strip_comments,
resolve_depth + 1, resolve_depth + 1,
)? { )? {
let p = p.trim().trim_matches('"'); let p = p.trim().trim_matches('"');
@ -409,10 +433,12 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
} }
} }
let (include, new_defines) = preprocess(path, &defines, include_paths, false) let (include, new_defines) =
.map_err(|x| Error::Include { preprocess(path, &defines, include_paths, strip_comments, false).map_err(
source: Box::new(x), |x| Error::Include {
})?; source: Box::new(x),
},
)?;
defines = new_defines; defines = new_defines;
ret.merge(include); ret.merge(include);
} }
@ -423,6 +449,7 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
path.as_ref(), path.as_ref(),
&defines, &defines,
include_paths, include_paths,
strip_comments,
resolve_depth + 1, resolve_depth + 1,
)? { )? {
ret.push(&text, origin); ret.push(&text, origin);
@ -516,6 +543,7 @@ fn resolve_text_macro_usage<T: AsRef<Path>, U: AsRef<Path>>(
path: T, path: T,
defines: &Defines, defines: &Defines,
include_paths: &[U], include_paths: &[U],
strip_comments: bool,
resolve_depth: usize, resolve_depth: usize,
) -> Result<Option<(String, Option<(PathBuf, Range)>, Defines)>, Error> { ) -> Result<Option<(String, Option<(PathBuf, Range)>, Defines)>, Error> {
let (_, ref name, ref args) = x.nodes; let (_, ref name, ref args) = x.nodes;
@ -591,13 +619,13 @@ fn resolve_text_macro_usage<T: AsRef<Path>, U: AsRef<Path>>(
replaced.push_str(" "); replaced.push_str(" ");
// remove leading whitespace // remove leading whitespace
replaced = String::from(replaced.trim_start()); replaced = String::from(replaced.trim_start());
let (replaced, new_defines) = preprocess_str( let (replaced, new_defines) = preprocess_str(
&replaced, &replaced,
path.as_ref(), path.as_ref(),
&defines, &defines,
include_paths, include_paths,
false, false,
strip_comments,
resolve_depth, resolve_depth,
)?; )?;
Ok(Some(( Ok(Some((
@ -634,6 +662,7 @@ mod tests {
get_testcase("test1.sv"), get_testcase("test1.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -660,8 +689,14 @@ endmodule
fn test1_predefine() { fn test1_predefine() {
let mut defines = HashMap::new(); let mut defines = HashMap::new();
defines.insert(String::from("behavioral"), None); defines.insert(String::from("behavioral"), None);
let (ret, _) = let (ret, _) = preprocess(
preprocess(get_testcase("test1.sv"), &defines, &[] as &[String], false).unwrap(); get_testcase("test1.sv"),
&defines,
&[] as &[String],
true,
false,
)
.unwrap();
assert_eq!( assert_eq!(
ret.text(), ret.text(),
r##"module and_op (a, b, c); r##"module and_op (a, b, c);
@ -681,6 +716,7 @@ endmodule
get_testcase("test2.sv"), get_testcase("test2.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true,
false, false,
) )
.unwrap(); .unwrap();
@ -719,6 +755,7 @@ endmodule
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true, true,
true,
) )
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
@ -735,6 +772,7 @@ endmodule
get_testcase("test3.sv"), get_testcase("test3.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -757,6 +795,7 @@ module a ();
get_testcase("test4.sv"), get_testcase("test4.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -783,6 +822,7 @@ endmodule
get_testcase("test5.sv"), get_testcase("test5.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -808,6 +848,7 @@ endmodule
get_testcase("test6.sv"), get_testcase("test6.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -830,6 +871,7 @@ endmodule
get_testcase("test7.sv"), get_testcase("test7.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)"); assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)");
@ -841,6 +883,7 @@ endmodule
get_testcase("test8.sv"), get_testcase("test8.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)"); assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)");
@ -853,6 +896,7 @@ endmodule
get_testcase("test9.sv"), get_testcase("test9.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(IncludeLine)"); assert_eq!(format!("{:?}", ret), "Err(IncludeLine)");
@ -865,6 +909,7 @@ endmodule
get_testcase("test10.sv"), get_testcase("test10.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(IncludeLine)"); assert_eq!(format!("{:?}", ret), "Err(IncludeLine)");
@ -876,6 +921,7 @@ endmodule
get_testcase("test11.sv"), get_testcase("test11.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();
@ -897,6 +943,7 @@ endmodule
get_testcase("test12.sv"), get_testcase("test12.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true,
false, false,
) )
.unwrap(); .unwrap();

2
sv-parser/examples/parse_sv.rs
View File

@ -36,7 +36,7 @@ fn main() {
let mut exit = 0; let mut exit = 0;
for path in &opt.files { for path in &opt.files {
if opt.pp { if opt.pp {
match preprocess(&path, &defines, &opt.includes, false) { match preprocess(&path, &defines, &opt.includes, true, false) {
Ok((preprocessed_text, new_defines)) => { Ok((preprocessed_text, new_defines)) => {
println!("{}", preprocessed_text.text()); println!("{}", preprocessed_text.text());
defines = new_defines; defines = new_defines;

31
sv-parser/src/lib.rs
View File

@ -98,7 +98,7 @@ pub fn parse_sv<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
include_paths: &[U], include_paths: &[U],
ignore_include: bool, ignore_include: bool,
) -> Result<(SyntaxTree, Defines), Error> { ) -> Result<(SyntaxTree, Defines), Error> {
let (text, defines) = preprocess(path, pre_defines, include_paths, ignore_include)?; let (text, defines) = preprocess(path, pre_defines, include_paths, false, ignore_include)?;
let span = Span::new_extra(text.text(), SpanInfo::default()); let span = Span::new_extra(text.text(), SpanInfo::default());
let result = all_consuming(sv_parser)(span); let result = all_consuming(sv_parser)(span);
match result { match result {
@ -136,7 +136,15 @@ pub fn parse_sv_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
include_paths: &[U], include_paths: &[U],
ignore_include: bool, ignore_include: bool,
) -> Result<(SyntaxTree, Defines), Error> { ) -> Result<(SyntaxTree, Defines), Error> {
let (text, defines) = preprocess_str(s, path, pre_defines, include_paths, ignore_include, 0)?; let (text, defines) = preprocess_str(
s,
path,
pre_defines,
include_paths,
ignore_include,
false,
0,
)?;
let span = Span::new_extra(text.text(), SpanInfo::default()); let span = Span::new_extra(text.text(), SpanInfo::default());
let result = all_consuming(sv_parser)(span); let result = all_consuming(sv_parser)(span);
match result { match result {
@ -171,9 +179,16 @@ pub fn parse_lib<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
path: T, path: T,
pre_defines: &HashMap<String, Option<Define>, V>, pre_defines: &HashMap<String, Option<Define>, V>,
include_paths: &[U], include_paths: &[U],
strip_comments: bool,
ignore_include: bool, ignore_include: bool,
) -> Result<(SyntaxTree, Defines), Error> { ) -> Result<(SyntaxTree, Defines), Error> {
let (text, defines) = preprocess(path, pre_defines, include_paths, ignore_include)?; let (text, defines) = preprocess(
path,
pre_defines,
include_paths,
strip_comments,
ignore_include,
)?;
let span = Span::new_extra(text.text(), SpanInfo::default()); let span = Span::new_extra(text.text(), SpanInfo::default());
let result = all_consuming(lib_parser)(span); let result = all_consuming(lib_parser)(span);
match result { match result {
@ -211,7 +226,15 @@ pub fn parse_lib_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
include_paths: &[U], include_paths: &[U],
ignore_include: bool, ignore_include: bool,
) -> Result<(SyntaxTree, Defines), Error> { ) -> Result<(SyntaxTree, Defines), Error> {
let (text, defines) = preprocess_str(s, path, pre_defines, include_paths, ignore_include, 0)?; let (text, defines) = preprocess_str(
s,
path,
pre_defines,
include_paths,
ignore_include,
false,
0,
)?;
let span = Span::new_extra(text.text(), SpanInfo::default()); let span = Span::new_extra(text.text(), SpanInfo::default());
let result = all_consuming(lib_parser)(span); let result = all_consuming(lib_parser)(span);
match result { match result {