diff --git a/src/parser.rs b/src/parser.rs index a5eee58..3210d40 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -150,8 +150,9 @@ impl ListId { } /// Convert the content of a file to a list of lines fn from_string(file_content: String) -> Result { - let mut global_id = 0; + let mut global_id = 1; let mut globlist = ListId::new(100); + globlist.add_item(SkillTypes::Root, "[Root]", 0, 0); let (mut last_sect, mut last_subs, mut last_skill, mut last_sskill) = (0, 0, 0, 0); for line in file_content.lines() { // Can't parse an empty symbol @@ -342,36 +343,70 @@ mod test { } #[test] fn test_edge_cases() { - let line_id = ListId::from_string("\n".to_string()).unwrap(); - println!("{:?}", line_id); - assert!(line_id.list.is_empty()); - let line_id = ListId::from_string("".to_string()).unwrap(); - println!("{:?}", line_id); - assert!(line_id.list.is_empty()); - let line_id = ListId::from_string("\n \nnope".to_string()); - println!("{:?}", line_id); - // assert!(line_id.is_err()); - assert!(line_id.unwrap().list.is_empty()); + let data = ["\n", "", "\n \n ope", " Noe"]; + for d in data.iter() { + let line_id = ListId::from_string(d.to_string()).unwrap(); + println!("{:?}", line_id); + assert_eq!(line_id.list.len(), 1); + match line_id.get_kind(&0) { + SkillTypes::Root => (), + _ => panic!("The first section wasn't root"), + }; + } } #[test] fn test_fromstring() { let tst = [ - ("@ Sect", vec![(SkillTypes::Section, "Sect", 0, 0)]), + ( + "@ Sect", + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::Section, "Sect", 1, 0), + ], + ), ( "+ SubSecté", - vec![(SkillTypes::SubSection, "SubSecté", 0, 0)], + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::SubSection, "SubSecté", 1, 0), + ], + ), + ( + "= Skill", + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::Skill, "Skill", 1, 0), + ], + ), + ( + "- SubSkill", + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::SubSkill, "SubSkill", 1, 0), + ], + ), + ( + ". rpts", + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::RepeatingSkills, "rpts", 1, 0), + ], + ), + ( + "#rpitm", + vec![ + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::RepeatingItem, "rpitm", 1, 0), + ], ), - ("= Skill", vec![(SkillTypes::Skill, "Skill", 0, 0)]), - ("- SubSkill", vec![(SkillTypes::SubSkill, "SubSkill", 0, 0)]), - (". rpts", vec![(SkillTypes::RepeatingSkills, "rpts", 0, 0)]), - ("#rpitm", vec![(SkillTypes::RepeatingItem, "rpitm", 0, 0)]), ( "@s\n+ss\n=sk\n-sks", vec![ - (SkillTypes::Section, "s", 0, 0), - (SkillTypes::SubSection, "ss", 1, 0), - (SkillTypes::Skill, "sk", 2, 0), - (SkillTypes::SubSkill, "sks", 3, 0), + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::Section, "s", 1, 0), + (SkillTypes::SubSection, "ss", 2, 0), + (SkillTypes::Skill, "sk", 3, 0), + (SkillTypes::SubSkill, "sks", 4, 0), ], ), ( @@ -380,36 +415,37 @@ mod test { -sks0\n-sks1\n-sks2\n-sks3\n=sk1\n-sks0\n-sks1\n\ -sks2\n-sks3\n@s1\n+ss0\n#ri0\n#ri1\n+ss1\n.rpts0\n.rpts1", vec![ - (SkillTypes::Section, "s0", 0, 0), - (SkillTypes::SubSection, "ss0", 1, 0), - (SkillTypes::Skill, "sk0", 2, 0), - (SkillTypes::SubSkill, "sks0", 3, 0), - (SkillTypes::SubSkill, "sks1", 4, 1), - (SkillTypes::SubSkill, "sks2", 5, 2), - (SkillTypes::SubSkill, "sks3", 6, 3), - (SkillTypes::Skill, "sk1", 7, 1), - (SkillTypes::SubSkill, "sks0", 8, 0), - (SkillTypes::SubSkill, "sks1", 9, 1), - (SkillTypes::SubSkill, "sks2", 10, 2), - (SkillTypes::SubSkill, "sks3", 11, 3), - (SkillTypes::SubSection, "ss1", 12, 1), - (SkillTypes::Skill, "sk0", 13, 0), - (SkillTypes::SubSkill, "sks0", 14, 0), - (SkillTypes::SubSkill, "sks1", 15, 1), - (SkillTypes::SubSkill, "sks2", 16, 2), - (SkillTypes::SubSkill, "sks3", 17, 3), - (SkillTypes::Skill, "sk1", 18, 1), - (SkillTypes::SubSkill, "sks0", 19, 0), - (SkillTypes::SubSkill, "sks1", 20, 1), - (SkillTypes::SubSkill, "sks2", 21, 2), - (SkillTypes::SubSkill, "sks3", 22, 3), - (SkillTypes::Section, "s1", 23, 1), - (SkillTypes::SubSection, "ss0", 24, 0), - (SkillTypes::RepeatingItem, "ri0", 25, 0), - (SkillTypes::RepeatingItem, "ri1", 26, 0), - (SkillTypes::SubSection, "ss1", 27, 1), - (SkillTypes::RepeatingSkills, "rpts0", 28, 0), - (SkillTypes::RepeatingSkills, "rpts1", 29, 0), + (SkillTypes::Root, "[Root]", 0, 0), + (SkillTypes::Section, "s0", 1, 0), + (SkillTypes::SubSection, "ss0", 2, 0), + (SkillTypes::Skill, "sk0", 3, 0), + (SkillTypes::SubSkill, "sks0", 4, 0), + (SkillTypes::SubSkill, "sks1", 5, 1), + (SkillTypes::SubSkill, "sks2", 6, 2), + (SkillTypes::SubSkill, "sks3", 7, 3), + (SkillTypes::Skill, "sk1", 8, 1), + (SkillTypes::SubSkill, "sks0", 9, 0), + (SkillTypes::SubSkill, "sks1", 10, 1), + (SkillTypes::SubSkill, "sks2", 11, 2), + (SkillTypes::SubSkill, "sks3", 12, 3), + (SkillTypes::SubSection, "ss1", 13, 1), + (SkillTypes::Skill, "sk0", 14, 0), + (SkillTypes::SubSkill, "sks0", 15, 0), + (SkillTypes::SubSkill, "sks1", 16, 1), + (SkillTypes::SubSkill, "sks2", 17, 2), + (SkillTypes::SubSkill, "sks3", 18, 3), + (SkillTypes::Skill, "sk1", 19, 1), + (SkillTypes::SubSkill, "sks0", 20, 0), + (SkillTypes::SubSkill, "sks1", 21, 1), + (SkillTypes::SubSkill, "sks2", 22, 2), + (SkillTypes::SubSkill, "sks3", 23, 3), + (SkillTypes::Section, "s1", 24, 1), + (SkillTypes::SubSection, "ss0", 25, 0), + (SkillTypes::RepeatingItem, "ri0", 26, 0), + (SkillTypes::RepeatingItem, "ri1", 27, 0), + (SkillTypes::SubSection, "ss1", 28, 1), + (SkillTypes::RepeatingSkills, "rpts0", 29, 0), + (SkillTypes::RepeatingSkills, "rpts1", 30, 0), ], ), ]; @@ -439,7 +475,7 @@ mod test { =sk1\n-sks0\n-sks1\n-sks2\n-sks3\n+ss1\n=sk0\n\ -sks0\n-sks1\n-sks2\n-sks3\n=sk1\n-sks0\n-sks1\n\ -sks2\n-sks3\n+ss2\n#ri0\n#ri1\n+ss3\n.rpts0\n.rpts1\n\ - @s1\n+ss1\n#ri0"," [Section] s0 [0/0]\n [SubSection] ss0 [0/1]\n [Skill] sk0 [0/2]\n [SubSkill] sks0 [0/3]\n [SubSkill] sks1 [1/4]\n [SubSkill] sks2 [2/5]\n [SubSkill] sks3 [3/6]\n [Skill] sk1 [1/7]\n [SubSkill] sks0 [0/8]\n [SubSkill] sks1 [1/9]\n [SubSkill] sks2 [2/10]\n [SubSkill] sks3 [3/11]\n [SubSection] ss1 [1/12]\n [Skill] sk0 [0/13]\n [SubSkill] sks0 [0/14]\n [SubSkill] sks1 [1/15]\n [SubSkill] sks2 [2/16]\n [SubSkill] sks3 [3/17]\n [Skill] sk1 [1/18]\n [SubSkill] sks0 [0/19]\n [SubSkill] sks1 [1/20]\n [SubSkill] sks2 [2/21]\n [SubSkill] sks3 [3/22]\n [SubSection] ss2 [2/23]\n [RepeatingItem] ri0 [0/24]\n [RepeatingItem] ri1 [0/25]\n [SubSection] ss3 [3/26]\n [RepeatingSkills] rpts0 [0/27]\n [RepeatingSkills] rpts1 [0/28]\n [Section] s1 [1/29]\n [SubSection] ss1 [0/30]\n [RepeatingItem] ri0 [0/31]"), + @s1\n+ss1\n#ri0"," [Section] s0 [0/1]\n [SubSection] ss0 [0/2]\n [Skill] sk0 [0/3]\n [SubSkill] sks0 [0/4]\n [SubSkill] sks1 [1/5]\n [SubSkill] sks2 [2/6]\n [SubSkill] sks3 [3/7]\n [Skill] sk1 [1/8]\n [SubSkill] sks0 [0/9]\n [SubSkill] sks1 [1/10]\n [SubSkill] sks2 [2/11]\n [SubSkill] sks3 [3/12]\n [SubSection] ss1 [1/13]\n [Skill] sk0 [0/14]\n [SubSkill] sks0 [0/15]\n [SubSkill] sks1 [1/16]\n [SubSkill] sks2 [2/17]\n [SubSkill] sks3 [3/18]\n [Skill] sk1 [1/19]\n [SubSkill] sks0 [0/20]\n [SubSkill] sks1 [1/21]\n [SubSkill] sks2 [2/22]\n [SubSkill] sks3 [3/23]\n [SubSection] ss2 [2/24]\n [RepeatingItem] ri0 [0/25]\n [RepeatingItem] ri1 [0/26]\n [SubSection] ss3 [3/27]\n [RepeatingSkills] rpts0 [0/28]\n [RepeatingSkills] rpts1 [0/29]\n [Section] s1 [1/30]\n [SubSection] ss1 [0/31]\n [RepeatingItem] ri0 [0/32]"), ]; for (data, res) in test_dt.iter() { let mut line_id = ListId::from_string(data.to_string()).unwrap(); @@ -458,15 +494,15 @@ mod test { #[test] fn test_node() { let test_dt = [ - ("@s0\n\n+ss0\n=sk0\n-sks0", " [Section] s0 [0/0]\n [SubSection] ss0 [0/1]\n [Skill] sk0 [0/2]\n [SubSkill] sks0 [0/3]"), - ("@s0\n \n \n \n+ss0\n=sk0\n-sks0\n-sks1\n-sks2", " [Section] s0 [0/0]\n [SubSection] ss0 [0/1]\n [Skill] sk0 [0/2]\n [SubSkill] sks0 [0/3]\n [SubSkill] sks1 [1/4]\n [SubSkill] sks2 [2/5]"), - ("@s0\n\n+ss0\n=sk0\n-sks0\n-sks1\n-sks2\n=sk1\n-sks0\n-sks1\n-sks2", " [Section] s0 [0/0]\n [SubSection] ss0 [0/1]\n [Skill] sk0 [0/2]\n [SubSkill] sks0 [0/3]\n [SubSkill] sks1 [1/4]\n [SubSkill] sks2 [2/5]\n [Skill] sk1 [1/6]\n [SubSkill] sks0 [0/7]\n [SubSkill] sks1 [1/8]\n [SubSkill] sks2 [2/9]"), + ("@s0\n\n+ss0\n=sk0\n-sks0", " [Root] [Root] [0/0]\n [Section] s0 [0/1]\n [SubSection] ss0 [0/2]\n [Skill] sk0 [0/3]\n [SubSkill] sks0 [0/4]"), + ("@s0\n \n \n \n+ss0\n=sk0\n-sks0\n-sks1\n-sks2", " [Root] [Root] [0/0]\n [Section] s0 [0/1]\n [SubSection] ss0 [0/2]\n [Skill] sk0 [0/3]\n [SubSkill] sks0 [0/4]\n [SubSkill] sks1 [1/5]\n [SubSkill] sks2 [2/6]"), + ("@s0\n\n+ss0\n=sk0\n-sks0\n-sks1\n-sks2\n=sk1\n-sks0\n-sks1\n-sks2", " [Root] [Root] [0/0]\n [Section] s0 [0/1]\n [SubSection] ss0 [0/2]\n [Skill] sk0 [0/3]\n [SubSkill] sks0 [0/4]\n [SubSkill] sks1 [1/5]\n [SubSkill] sks2 [2/6]\n [Skill] sk1 [1/7]\n [SubSkill] sks0 [0/8]\n [SubSkill] sks1 [1/9]\n [SubSkill] sks2 [2/10]"), ("@s0\n+ss0\n=sk0\n-sks0\n-sks1\n-sks2\n-sks3\n\ =sk1\n-sks0\n-sks1\n-sks2\n-sks3\n+ss1\n=sk0\n\ -sks0\n-sks1\n-sks2\n-sks3\n=sk1\n-sks0\n-sks1\n\ -sks2\n-sks3\n+ss2\n#ri0\n#ri1\n+ss3\n.rpts0\n.rpts1\n\ - @s1\n+ss1\n#ri0"," [Section] s0 [0/0]\n [SubSection] ss0 [0/1]\n [Skill] sk0 [0/2]\n [SubSkill] sks0 [0/3]\n [SubSkill] sks1 [1/4]\n [SubSkill] sks2 [2/5]\n [SubSkill] sks3 [3/6]\n [Skill] sk1 [1/7]\n [SubSkill] sks0 [0/8]\n [SubSkill] sks1 [1/9]\n [SubSkill] sks2 [2/10]\n [SubSkill] sks3 [3/11]\n [SubSection] ss1 [1/12]\n [Skill] sk0 [0/13]\n [SubSkill] sks0 [0/14]\n [SubSkill] sks1 [1/15]\n [SubSkill] sks2 [2/16]\n [SubSkill] sks3 [3/17]\n [Skill] sk1 [1/18]\n [SubSkill] sks0 [0/19]\n [SubSkill] sks1 [1/20]\n [SubSkill] sks2 [2/21]\n [SubSkill] sks3 [3/22]\n [SubSection] ss2 [2/23]\n [RepeatingItem] ri0 [0/24]\n [RepeatingItem] ri1 [0/25]\n [SubSection] ss3 [3/26]\n [RepeatingSkills] rpts0 [0/27]\n [RepeatingSkills] rpts1 [0/28]"), - ]; + @s1\n+ss1\n#ri0"," [Root] [Root] [0/0]\n [Section] s0 [0/1]\n [SubSection] ss0 [0/2]\n [Skill] sk0 [0/3]\n [SubSkill] sks0 [0/4]\n [SubSkill] sks1 [1/5]\n [SubSkill] sks2 [2/6]\n [SubSkill] sks3 [3/7]\n [Skill] sk1 [1/8]\n [SubSkill] sks0 [0/9]\n [SubSkill] sks1 [1/10]\n [SubSkill] sks2 [2/11]\n [SubSkill] sks3 [3/12]\n [SubSection] ss1 [1/13]\n [Skill] sk0 [0/14]\n [SubSkill] sks0 [0/15]\n [SubSkill] sks1 [1/16]\n [SubSkill] sks2 [2/17]\n [SubSkill] sks3 [3/18]\n [Skill] sk1 [1/19]\n [SubSkill] sks0 [0/20]\n [SubSkill] sks1 [1/21]\n [SubSkill] sks2 [2/22]\n [SubSkill] sks3 [3/23]\n [SubSection] ss2 [2/24]\n [RepeatingItem] ri0 [0/25]\n [RepeatingItem] ri1 [0/26]\n [SubSection] ss3 [3/27]\n [RepeatingSkills] rpts0 [0/28]\n [RepeatingSkills] rpts1 [0/29]\n [Section] s1 [1/30]\n [SubSection] ss1 [0/31]\n [RepeatingItem] ri0 [0/32]"), + ]; for (file_content, expected) in test_dt.iter() { println!("::<> Testing for:\n {}", file_content);