diff --git a/sv-parser-pp/src/preprocess.rs b/sv-parser-pp/src/preprocess.rs index 9922488..cafa971 100644 --- a/sv-parser-pp/src/preprocess.rs +++ b/sv-parser-pp/src/preprocess.rs @@ -1095,14 +1095,14 @@ mod tests { assert_eq!(ret.origin(10).unwrap().1, 10); assert_eq!( ret.origin(60).unwrap().0, - &PathBuf::from(testfile_path("test2.svh")) + &PathBuf::from(testfile_path("included.svh")) ); assert_eq!(ret.origin(60).unwrap().1, 74); assert_eq!( ret.origin(80).unwrap().0, &PathBuf::from(testfile_path("include_basic.sv")) ); - assert_eq!(ret.origin(80).unwrap().1, 60); + assert_eq!(ret.origin(80).unwrap().1, 63); } #[test] @@ -1144,14 +1144,14 @@ mod tests { assert_eq!(ret.origin(10).unwrap().1, 10); assert_eq!( ret.origin(50).unwrap().0, - &PathBuf::from(testfile_path("test2.svh")) + &PathBuf::from(testfile_path("included.svh")) ); assert_eq!(ret.origin(50).unwrap().1, 73); assert_eq!( ret.origin(70).unwrap().0, &PathBuf::from(testfile_path("include_origin.sv")) ); - assert_eq!(ret.origin(70).unwrap().1, 50); + assert_eq!(ret.origin(70).unwrap().1, 53); } #[test] @@ -1176,14 +1176,14 @@ mod tests { assert_eq!(ret.origin(10).unwrap().1, 10); assert_eq!( ret.origin(50).unwrap().0, - &PathBuf::from(testfile_path("test2.svh")) + &PathBuf::from(testfile_path("included.svh")) ); assert_eq!(ret.origin(50).unwrap().1, 73); assert_eq!( ret.origin(70).unwrap().0, &PathBuf::from(testfile_path("include_sameline_comment.sv")) ); - assert_eq!(ret.origin(70).unwrap().1, 50); + assert_eq!(ret.origin(70).unwrap().1, 53); } #[test] diff --git a/sv-parser-pp/testcases/include_basic.sv b/sv-parser-pp/testcases/include_basic.sv index 63fe552..76fe96f 100644 --- a/sv-parser-pp/testcases/include_basic.sv +++ b/sv-parser-pp/testcases/include_basic.sv @@ -1,4 +1,4 @@ module and_op (a, b, c); // a - `include "test2.svh" + `include "included.svh" endmodule diff --git a/sv-parser-pp/testcases/include_ignore.sv b/sv-parser-pp/testcases/include_ignore.sv index 873c201..1c757dd 100644 --- a/sv-parser-pp/testcases/include_ignore.sv +++ b/sv-parser-pp/testcases/include_ignore.sv @@ -1,3 +1,3 @@ module and_op (a, b, c); -`include "test2.svh" +`include "included.svh" endmodule diff --git a/sv-parser-pp/testcases/include_origin.sv b/sv-parser-pp/testcases/include_origin.sv index 873c201..1c757dd 100644 --- a/sv-parser-pp/testcases/include_origin.sv +++ b/sv-parser-pp/testcases/include_origin.sv @@ -1,3 +1,3 @@ module and_op (a, b, c); -`include "test2.svh" +`include "included.svh" endmodule diff --git a/sv-parser-pp/testcases/include_sameline_comment.sv b/sv-parser-pp/testcases/include_sameline_comment.sv index bb10a1f..1f17750 100644 --- a/sv-parser-pp/testcases/include_sameline_comment.sv +++ b/sv-parser-pp/testcases/include_sameline_comment.sv @@ -1,3 +1,3 @@ module and_op (a, b, c); -`include "test2.svh" // comment +`include "included.svh" // comment endmodule diff --git a/sv-parser-pp/testcases/include_sameline_include.sv b/sv-parser-pp/testcases/include_sameline_include.sv index ad10dda..64b02fb 100644 --- a/sv-parser-pp/testcases/include_sameline_include.sv +++ b/sv-parser-pp/testcases/include_sameline_include.sv @@ -1,3 +1,3 @@ module and_op (a, b, c); -`include "test2.svh" `include "test2.svh" +`include "included.svh" `include "included.svh" endmodule diff --git a/sv-parser-pp/testcases/include_sameline_keyword.sv b/sv-parser-pp/testcases/include_sameline_keyword.sv index 8c2a37c..acd0ae3 100644 --- a/sv-parser-pp/testcases/include_sameline_keyword.sv +++ b/sv-parser-pp/testcases/include_sameline_keyword.sv @@ -1,2 +1,2 @@ module and_op (a, b, c); -`include "test2.svh" endmodule +`include "included.svh" endmodule diff --git a/sv-parser-pp/testcases/test2.svh b/sv-parser-pp/testcases/included.svh similarity index 100% rename from sv-parser-pp/testcases/test2.svh rename to sv-parser-pp/testcases/included.svh