supleed2/sv-filelist-parser
1
0
Fork 0
mirror of https://github.com/supleed2/sv-filelist-parser.git synced 2024-12-22 21:35:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Parsing incdir

Browse source 
- Added incdir parsing
- Fixed the ending + bug
- Added more tests for single and multiple values in define and incdir
This commit is contained in:
Raamakrishnan 2020-01-22 23:02:58 +05:30
parent 319a7108bf
commit 9177bd6a1c
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/lib.rs
View file

@ -15,13 +15,19 @@ fn parse_line<'a>(line: &'a str) -> LineType<'a> {
let filelist_name = line.trim_start_matches("-f "); let filelist_name = line.trim_start_matches("-f ");
return LineType::Filelist(filelist_name); return LineType::Filelist(filelist_name);
} else if line.starts_with("+define+") { } else if line.starts_with("+define+") {
let defines = line.trim_start_matches("+define+"); // remove +define+ from start and "+" from end
let defines = line.trim_start_matches("+define+").trim_end_matches("+");
let mut define_map = HashMap::new(); let mut define_map = HashMap::new();
for define in defines.split("+") { for define in defines.split("+") {
let split: Vec<&str> = define.splitn(2, "=").collect(); let split: Vec<&str> = define.splitn(2, "=").collect();
define_map.insert(split[0], split[1]); define_map.insert(split[0], split[1]);
} }
return LineType::Define(define_map); return LineType::Define(define_map);
} else if line.starts_with("+incdir+") {
// remove +incdir+ from start and "+" from end
let incdirs = line.trim_start_matches("+incdir+").trim_end_matches("+");
let incdir_vec: Vec<&str> = incdirs.split("+").collect();
return LineType::IncDir(incdir_vec);
} else { } else {
return LineType::Unknown; return LineType::Unknown;
} }
@ -33,17 +39,40 @@ mod test {
#[test] #[test]
fn parse_line_filelist() { fn parse_line_filelist() {
let line = "-f sample/files.f"; let line = "-f sample/files.f\n";
assert_eq!(parse_line(line), LineType::Filelist("sample/files.f")); assert_eq!(parse_line(line), LineType::Filelist("sample/files.f"));
} }
#[test] #[test]
fn parse_line_define() { fn parse_line_define_single() {
let line = "+define+CONST1=const1+CONST2=const2+CONST3=const3=1"; let line = "+define+CONST1=const1=23\n";
let mut define_map = HashMap::new();
define_map.insert("CONST1", "const1=23");
assert_eq!(parse_line(line), LineType::Define(define_map));
}
#[test]
fn parse_line_define_multiple() {
let line = "+define+CONST1=const1+CONST2=const2+CONST3=const3=1+\n";
let mut define_map = HashMap::new(); let mut define_map = HashMap::new();
define_map.insert("CONST1", "const1"); define_map.insert("CONST1", "const1");
define_map.insert("CONST2", "const2"); define_map.insert("CONST2", "const2");
define_map.insert("CONST3", "const3=1"); define_map.insert("CONST3", "const3=1");
assert_eq!(parse_line(line), LineType::Define(define_map)); assert_eq!(parse_line(line), LineType::Define(define_map));
} }
#[test]
fn parse_line_incdir_single() {
let line = "+incdir+../sample_dir1/sample_dir2\n";
let incdir_vec = vec!["../sample_dir1/sample_dir2"];
assert_eq!(parse_line(line), LineType::IncDir(incdir_vec));
}
#[test]
fn parse_line_incdir_multiple() {
let line = "+incdir+../sample_dir1/sample_dir2+../sample_dir2/sample_dir3+sample_dir4/sample_dir5+\n";
let incdir_vec = vec!["../sample_dir1/sample_dir2", "../sample_dir2/sample_dir3",
"sample_dir4/sample_dir5"];
assert_eq!(parse_line(line), LineType::IncDir(incdir_vec));
}
} }