Added logic to parse the entire file

src/file_parser.rs

@@ -0,0 +1,51 @@
+use std::collections::HashMap;
+use std::error::Error;
+use std::fs;
+
+use crate::line_parser;
+use crate::line_parser::LineType;
+
+#[derive(Debug)]
+pub struct Filelist {
+    pub files: Vec<String>,
+    pub incdirs: Vec<String>,
+    pub defines: HashMap<String, String>,
+
+    pub comments_present: bool,
+}
+
+impl Filelist {
+    pub fn new() -> Filelist {
+        Filelist {
+            files: Vec::new(),
+            incdirs: Vec::new(),
+            defines: HashMap::new(),
+            comments_present: false,
+        }
+    }
+}
+
+pub fn parse_file(path: &str) -> Result<Filelist, Box<dyn Error>> {
+    let contents = fs::read_to_string(path)?;
+
+    let mut filelist = Filelist::new();
+
+    for line in contents.lines() {
+        match line_parser::parse_line(line) {
+            LineType::File(file) => filelist.files.push(file.to_string()),
+            LineType::Define(define_map) => {
+                for define in define_map.into_iter() {
+                    filelist.defines.insert(define.0.to_string(), define.1.to_string());
+                }
+            },
+            LineType::IncDir(incdirs) => {
+                for dir in incdirs {
+                    filelist.incdirs.push(dir.to_string());
+                }
+            }
+            LineType::Comment => filelist.comments_present = true,
+            _ => {}
+        }
+    }
+    Ok(filelist)
+}

src/lib.rs

@@ -1,97 +1,9 @@
-use std::collections::HashMap;
+pub mod line_parser;
+pub mod file_parser;
 
-#[derive(PartialEq, Debug)]
+use file_parser::Filelist;
-enum LineType<'a> {
+use std::error::Error;
-    File(&'a str),
-    IncDir(Vec<&'a str>),
-    Define(HashMap<&'a str, &'a str>),
-    Filelist(&'a str),
-    Comment,
-    // Unknown,
-}
 
-fn parse_line(line: &str) -> LineType {
+pub fn parse(path: &str) -> Result<Filelist, Box<dyn Error>> {
-    let line = line.trim();
+    file_parser::parse_file(path)
-    if line.starts_with("-f ") {
-        let filelist_name = line.trim_start_matches("-f ");
-        LineType::Filelist(filelist_name)
-    } else if line.starts_with("+define+") {
-        // remove +define+ from start and "+" from end
-        let defines = line.trim_start_matches("+define+").trim_end_matches('+');
-        let mut define_map = HashMap::new();
-        for define in defines.split('+') {
-            let split: Vec<&str> = define.splitn(2, '=').collect();
-            define_map.insert(split[0], split[1]);
-        }
-        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();
-        LineType::IncDir(incdir_vec)
-    } else if line.starts_with("//") {
-        LineType::Comment
-    } else {
-        // Mark everything else as a File
-        LineType::File(line)
-    }
-}
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn parse_line_filelist() {
-        let line = "-f sample/files.f\n";
-        assert_eq!(parse_line(line), LineType::Filelist("sample/files.f"));
-    }
-
-    #[test]
-    fn parse_line_define_single() {
-        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();
-        define_map.insert("CONST1", "const1");
-        define_map.insert("CONST2", "const2");
-        define_map.insert("CONST3", "const3=1");
-        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));
-    }
-
-    #[test]
-    fn parse_line_comment() {
-        let line = "//random_comment";
-        assert_eq!(parse_line(line), LineType::Comment);
-    }
-
-    #[test]
-    fn parse_line_file() {
-        let line = "any_random_line_is_a_file";
-        assert_eq!(parse_line(line), LineType::File("any_random_line_is_a_file"));
-    }
 }