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

Fix text macro with single line comment #12

Browse Source
This commit is contained in:
dalance 2020-08-28 18:35:05 +09:00
parent 30c34fa7ee
commit b678874f4d
4 changed files with 104 additions and 33 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.8.0...Unreleased) - ReleaseDate ## [Unreleased](https://github.com/dalance/sv-parser/compare/v0.8.0...Unreleased) - ReleaseDate
* [Fixed] text macro with single line comment [#12](https://github.com/dalance/sv-parser/issues/12)
## [v0.8.0](https://github.com/dalance/sv-parser/compare/v0.7.0...v0.8.0) - 2020-08-28 ## [v0.8.0](https://github.com/dalance/sv-parser/compare/v0.7.0...v0.8.0) - 2020-08-28
* [Fixed] 'Declaraton' typo [#18](https://github.com/dalance/sv-parser/issues/18) * [Fixed] 'Declaraton' typo [#18](https://github.com/dalance/sv-parser/issues/18)

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

@ -14,7 +14,7 @@ use sv_parser_syntaxtree::{
WhiteSpace, WhiteSpace,
}; };
const RECURSIVE_LIMIT: usize = 128; const RECURSIVE_LIMIT: usize = 64;
#[derive(Debug)] #[derive(Debug)]
pub struct PreprocessedText { pub struct PreprocessedText {
@ -230,11 +230,17 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
ret.push(locate.str(&s), Some((path.as_ref(), range))); ret.push(locate.str(&s), Some((path.as_ref(), range)));
} }
NodeEvent::Enter(RefNode::UndefineCompilerDirective(x)) if !skip => { NodeEvent::Enter(RefNode::UndefineCompilerDirective(x)) if !skip => {
skip_nodes.push(x.into());
skip = true;
let (_, _, ref name) = x.nodes; let (_, _, ref name) = x.nodes;
let id = identifier((&name.nodes.0).into(), &s).unwrap(); let id = identifier((&name.nodes.0).into(), &s).unwrap();
defines.remove(&id); defines.remove(&id);
} }
NodeEvent::Enter(RefNode::UndefineallCompilerDirective(_)) if !skip => { NodeEvent::Enter(RefNode::UndefineallCompilerDirective(x)) if !skip => {
skip_nodes.push(x.into());
skip = true;
defines.clear(); defines.clear();
} }
NodeEvent::Enter(RefNode::SourceDescriptionNotDirective(x)) if !skip => { NodeEvent::Enter(RefNode::SourceDescriptionNotDirective(x)) if !skip => {
@ -267,7 +273,10 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
ret.push(locate.str(&s), Some((path.as_ref(), range))); ret.push(locate.str(&s), Some((path.as_ref(), range)));
} }
NodeEvent::Enter(RefNode::IfdefDirective(x)) if !skip => { NodeEvent::Enter(RefNode::IfdefDirective(x)) if !skip => {
let (_, _, ref ifid, ref ifbody, ref elsif, ref elsebody, _, _) = x.nodes; let (_, ref keyword, ref ifid, ref ifbody, ref elsif, ref elsebody, _, _) = x.nodes;
skip_nodes.push(keyword.into());
skip_nodes.push(ifid.into());
let ifid = identifier(ifid.into(), &s).unwrap(); let ifid = identifier(ifid.into(), &s).unwrap();
let mut hit = false; let mut hit = false;
if defines.contains_key(&ifid) { if defines.contains_key(&ifid) {
@ -277,7 +286,10 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
for x in elsif { for x in elsif {
let (_, _, ref elsifid, ref elsifbody) = x; let (_, ref keyword, ref elsifid, ref elsifbody) = x;
skip_nodes.push(keyword.into());
skip_nodes.push(elsifid.into());
let elsifid = identifier(elsifid.into(), &s).unwrap(); let elsifid = identifier(elsifid.into(), &s).unwrap();
if hit { if hit {
skip_nodes.push(elsifbody.into()); skip_nodes.push(elsifbody.into());
@ -289,7 +301,8 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
if let Some(elsebody) = elsebody { if let Some(elsebody) = elsebody {
let (_, _, ref elsebody) = elsebody; let (_, ref keyword, ref elsebody) = elsebody;
skip_nodes.push(keyword.into());
if hit { if hit {
skip_nodes.push(elsebody.into()); skip_nodes.push(elsebody.into());
} }
@ -308,7 +321,10 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
ret.push(locate.str(&s), Some((path.as_ref(), range))); 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 keyword, ref ifid, ref ifbody, ref elsif, ref elsebody, _, _) = x.nodes;
skip_nodes.push(keyword.into());
skip_nodes.push(ifid.into());
let ifid = identifier(ifid.into(), &s).unwrap(); let ifid = identifier(ifid.into(), &s).unwrap();
let mut hit = false; let mut hit = false;
if !defines.contains_key(&ifid) { if !defines.contains_key(&ifid) {
@ -318,7 +334,10 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
for x in elsif { for x in elsif {
let (_, _, ref elsifid, ref elsifbody) = x; let (_, ref keyword, ref elsifid, ref elsifbody) = x;
skip_nodes.push(keyword.into());
skip_nodes.push(elsifid.into());
let elsifid = identifier(elsifid.into(), &s).unwrap(); let elsifid = identifier(elsifid.into(), &s).unwrap();
if hit { if hit {
skip_nodes.push(elsifbody.into()); skip_nodes.push(elsifbody.into());
@ -330,13 +349,17 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
if let Some(elsebody) = elsebody { if let Some(elsebody) = elsebody {
let (_, _, ref elsebody) = elsebody; let (_, ref keyword, ref elsebody) = elsebody;
skip_nodes.push(keyword.into());
if hit { if hit {
skip_nodes.push(elsebody.into()); skip_nodes.push(elsebody.into());
} }
} }
} }
NodeEvent::Enter(RefNode::TextMacroDefinition(x)) if !skip => { NodeEvent::Enter(RefNode::TextMacroDefinition(x)) if !skip => {
skip_nodes.push(x.into());
skip = true;
let (_, _, ref proto, ref text) = x.nodes; let (_, _, ref proto, ref text) = x.nodes;
let (ref name, ref args) = proto.nodes; let (ref name, ref args) = proto.nodes;
let id = identifier(name.into(), &s).unwrap(); let id = identifier(name.into(), &s).unwrap();
@ -383,6 +406,9 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
defines.insert(id, Some(define)); defines.insert(id, Some(define));
} }
NodeEvent::Enter(RefNode::IncludeCompilerDirective(x)) if !skip && !ignore_include => { NodeEvent::Enter(RefNode::IncludeCompilerDirective(x)) if !skip && !ignore_include => {
skip_nodes.push(x.into());
skip = true;
let locate: Locate = x.try_into().unwrap(); let locate: Locate = x.try_into().unwrap();
last_include_line = Some(locate.line); last_include_line = Some(locate.line);
@ -394,20 +420,26 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
let mut path = match x { let mut path = match x {
IncludeCompilerDirective::DoubleQuote(x) => { IncludeCompilerDirective::DoubleQuote(x) => {
let (_, _, ref literal) = x.nodes; let (_, ref keyword, ref literal) = x.nodes;
skip_nodes.push(keyword.into());
let (locate, _) = literal.nodes; let (locate, _) = literal.nodes;
let p = locate.str(&s).trim_matches('"'); let p = locate.str(&s).trim_matches('"');
PathBuf::from(p) PathBuf::from(p)
} }
IncludeCompilerDirective::AngleBracket(x) => { IncludeCompilerDirective::AngleBracket(x) => {
let (_, _, ref literal) = x.nodes; let (_, ref keyword, ref literal) = x.nodes;
skip_nodes.push(keyword.into());
let (locate, _) = literal.nodes; let (locate, _) = literal.nodes;
let p = locate.str(&s).trim_start_matches('<').trim_end_matches('>'); let p = locate.str(&s).trim_start_matches('<').trim_end_matches('>');
PathBuf::from(p) PathBuf::from(p)
} }
IncludeCompilerDirective::TextMacroUsage(x) => { IncludeCompilerDirective::TextMacroUsage(x) => {
let (_, _, ref x) = x.nodes; let (_, ref keyword, ref x) = x.nodes;
skip_nodes.push(keyword.into());
skip_nodes.push(x.into()); skip_nodes.push(x.into());
if let Some((p, _, _)) = resolve_text_macro_usage( if let Some((p, _, _)) = resolve_text_macro_usage(
x, x,
s, s,
@ -443,6 +475,9 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
ret.merge(include); ret.merge(include);
} }
NodeEvent::Enter(RefNode::TextMacroUsage(x)) if !skip => { NodeEvent::Enter(RefNode::TextMacroUsage(x)) if !skip => {
skip_nodes.push(x.into());
skip = true;
if let Some((text, origin, new_defines)) = resolve_text_macro_usage( if let Some((text, origin, new_defines)) = resolve_text_macro_usage(
x, x,
s, s,
@ -457,6 +492,9 @@ pub fn preprocess_str<T: AsRef<Path>, U: AsRef<Path>, V: BuildHasher>(
} }
} }
NodeEvent::Enter(RefNode::PositionCompilerDirective(x)) if !skip => { NodeEvent::Enter(RefNode::PositionCompilerDirective(x)) if !skip => {
skip_nodes.push(x.into());
skip = true;
let (_, ref x) = x.nodes; let (_, ref x) = x.nodes;
let locate: Locate = x.try_into().unwrap(); let locate: Locate = x.try_into().unwrap();
let x = locate.str(s); let x = locate.str(s);
@ -503,7 +541,9 @@ fn split_text(s: &str) -> Vec<String> {
let mut is_ident_prev; let mut is_ident_prev;
let mut x = String::from(""); let mut x = String::from("");
let mut ret = vec![]; let mut ret = vec![];
for c in s.chars() {
let mut iter = s.chars().peekable();
while let Some(c) = iter.next() {
is_ident_prev = is_ident; is_ident_prev = is_ident;
is_ident = c.is_ascii_alphanumeric() | (c == '_'); is_ident = c.is_ascii_alphanumeric() | (c == '_');
@ -521,6 +561,8 @@ fn split_text(s: &str) -> Vec<String> {
ret.push(x); ret.push(x);
x = String::from(""); x = String::from("");
is_string = false; is_string = false;
} else if c == '/' && iter.peek() == Some(&'/') && !is_string {
break;
} else if !is_string { } else if !is_string {
if is_ident != is_ident_prev { if is_ident != is_ident_prev {
ret.push(x); ret.push(x);
@ -662,7 +704,7 @@ mod tests {
get_testcase("test1.sv"), get_testcase("test1.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -673,6 +715,7 @@ output a;
input b, c; input b, c;
and a1 (a,b,c); and a1 (a,b,c);
endmodule endmodule
"## "##
); );
@ -682,7 +725,7 @@ endmodule
); );
assert_eq!(ret.origin(10).unwrap().1, 10); assert_eq!(ret.origin(10).unwrap().1, 10);
assert_eq!(ret.origin(50).unwrap().1, 98); assert_eq!(ret.origin(50).unwrap().1, 98);
assert_eq!(ret.origin(70).unwrap().1, 125); assert_eq!(ret.origin(70).unwrap().1, 124);
} }
#[test] #[test]
@ -693,7 +736,7 @@ endmodule
get_testcase("test1.sv"), get_testcase("test1.sv"),
&defines, &defines,
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -704,6 +747,7 @@ output a;
input b, c; input b, c;
wire a = b & c; wire a = b & c;
endmodule endmodule
"## "##
) )
@ -716,7 +760,7 @@ endmodule
get_testcase("test2.sv"), get_testcase("test2.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -727,6 +771,8 @@ output a;
input b, c; input b, c;
and a1 (a,b,c); and a1 (a,b,c);
endmodule endmodule
"## "##
); );
@ -744,7 +790,7 @@ endmodule
ret.origin(70).unwrap().0, ret.origin(70).unwrap().0,
&PathBuf::from(get_testcase("test2.sv")) &PathBuf::from(get_testcase("test2.sv"))
); );
assert_eq!(ret.origin(70).unwrap().1, 52); assert_eq!(ret.origin(70).unwrap().1, 50);
} }
#[test] #[test]
@ -754,13 +800,14 @@ endmodule
get_testcase("test2.sv"), get_testcase("test2.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true, false,
true, true,
) )
.unwrap(); .unwrap();
assert_eq!( assert_eq!(
ret.text(), ret.text(),
r##"module and_op (a, b, c); r##"module and_op (a, b, c);
endmodule endmodule
"## "##
); );
@ -772,7 +819,7 @@ endmodule
get_testcase("test3.sv"), get_testcase("test3.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -795,7 +842,7 @@ module a ();
get_testcase("test4.sv"), get_testcase("test4.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -822,7 +869,7 @@ endmodule
get_testcase("test5.sv"), get_testcase("test5.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -848,7 +895,7 @@ endmodule
get_testcase("test6.sv"), get_testcase("test6.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -871,7 +918,7 @@ endmodule
get_testcase("test7.sv"), get_testcase("test7.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)"); assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)");
@ -883,7 +930,7 @@ endmodule
get_testcase("test8.sv"), get_testcase("test8.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)"); assert_eq!(format!("{:?}", ret), "Err(ExceedRecursiveLimit)");
@ -896,7 +943,7 @@ endmodule
get_testcase("test9.sv"), get_testcase("test9.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true, false,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(IncludeLine)"); assert_eq!(format!("{:?}", ret), "Err(IncludeLine)");
@ -909,7 +956,7 @@ endmodule
get_testcase("test10.sv"), get_testcase("test10.sv"),
&HashMap::new(), &HashMap::new(),
&include_paths, &include_paths,
true, false,
false, false,
); );
assert_eq!(format!("{:?}", ret), "Err(IncludeLine)"); assert_eq!(format!("{:?}", ret), "Err(IncludeLine)");
@ -921,7 +968,7 @@ endmodule
get_testcase("test11.sv"), get_testcase("test11.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -943,7 +990,7 @@ endmodule
get_testcase("test12.sv"), get_testcase("test12.sv"),
&HashMap::new(), &HashMap::new(),
&[] as &[String], &[] as &[String],
true, false,
false, false,
) )
.unwrap(); .unwrap();
@ -952,6 +999,25 @@ endmodule
r##"module a; r##"module a;
reg \`~!-_=+\|[]{};:'"",./<>? ; reg \`~!-_=+\|[]{};:'"",./<>? ;
endmodule endmodule
"##
);
}
#[test]
fn test13() {
let (ret, _) = preprocess(
get_testcase("test13.sv"),
&HashMap::new(),
&[] as &[String],
false,
false,
)
.unwrap();
assert_eq!(
ret.text(),
r##"
interface foo #(WIDTH = 42 ) ();
endinterface
"## "##
); );
} }

3
sv-parser-pp/testcases/test13.sv Normal file
View File

@ -0,0 +1,3 @@
`define NAME 42 // Comment
interface foo #(WIDTH = `NAME) ();
endinterface

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, true, false) { match preprocess(&path, &defines, &opt.includes, false, 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;