noah/mgen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed logic error + no incs case

Browse source
This commit is contained in:
Noah Swerhun 2023-12-13 10:41:35 -06:00
parent 63f12eac4d
commit 4ce746e845
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -153,7 +153,7 @@ impl Makefile {
panic!("error: makefile contains one mgen guard but not the other. cannot continue."); panic!("error: makefile contains one mgen guard but not the other. cannot continue.");
} }
if ! contains_start && contains_end { if !(contains_start && contains_end) {
let include_dirs = Makefile::get_include_dirs(&contents); let include_dirs = Makefile::get_include_dirs(&contents);
return Makefile { path: String::from(path), prologue: contents, return Makefile { path: String::from(path), prologue: contents,
mgen_zone: String::from(""), epilogue: String::from(""), include_dirs }; mgen_zone: String::from(""), epilogue: String::from(""), include_dirs };
@ -176,11 +176,14 @@ impl Makefile {
} }
fn get_include_dirs(search: &String) -> Vec<String> { fn get_include_dirs(search: &String) -> Vec<String> {
let mut include_dirs: Vec<String> = Vec::new();
let makefile_regex = Regex::new(r"^INCS\s*=\s*(.*?)$").unwrap(); let makefile_regex = Regex::new(r"^INCS\s*=\s*(.*?)$").unwrap();
let caps = makefile_regex.captures_iter(search); let caps = makefile_regex.captures_iter(search);
let (_, [dirlist]) = caps.map(|c| c.extract()).last().unwrap(); let dirlist = match caps.map(|c| c.extract()).last() {
Some((_, [v])) => v,
let mut include_dirs: Vec<String> = Vec::new(); None => return include_dirs,
};
let incdir_regex = Regex::new(r"-s*-I\s*(.*?)\s*").unwrap(); let incdir_regex = Regex::new(r"-s*-I\s*(.*?)\s*").unwrap();
let caps = incdir_regex.captures_iter(&dirlist); let caps = incdir_regex.captures_iter(&dirlist);