Fixes the node parser
This commit is contained in:
parent
475ad9b6b1
commit
46ec258469
|
|
@ -75,33 +75,27 @@ impl ListId {
|
|||
fn make_node(&self, index: &mut usize, level: SkillTypes) -> Result<Node, LoadError> {
|
||||
let mut list_childs = Vec::new();
|
||||
let (name, global_id, id) = self.get_info(index);
|
||||
println!("Processing {} [{}/{}]", name, global_id, id);
|
||||
let lower_level = level.get_lower_level();
|
||||
println!("=> Lower : {:?}", lower_level);
|
||||
// let lower_level = level.get_lower_level();
|
||||
// println!(
|
||||
// "=> Processing {} [{}/{}] => Lower({:?})",
|
||||
// name, global_id, id, lower_level
|
||||
// );
|
||||
if *self.get_kind(index) != level {
|
||||
return Err(LoadError::WrongHierarchy);
|
||||
}
|
||||
println!("Entering at : index {}", index);
|
||||
// println!(" > Entering at : index {}", index);
|
||||
*index += 1; // Very ugly
|
||||
match level {
|
||||
SkillTypes::Root => unimplemented!(),
|
||||
SkillTypes::Section | SkillTypes::SubSection | SkillTypes::Skill => {
|
||||
let lower_level = &lower_level.unwrap();
|
||||
// let lower_level = &lower_level.unwrap();
|
||||
while *index < self.list.len() {
|
||||
println!("Iterating at : index {}", index);
|
||||
// println!(" - Iterating at : index {}", index);
|
||||
if level.is_child(*self.get_kind(index)) {
|
||||
match self.make_node(index, *lower_level) {
|
||||
match self.make_node(index, *self.get_kind(index)) {
|
||||
Ok(value) => {
|
||||
println!("Retreiving :\n{}", value.debug_display());
|
||||
// println!(" < Retreiving :\n{}", value.debug_display());
|
||||
list_childs.push(value);
|
||||
// println!(
|
||||
// "Childs: \n{}",
|
||||
// list_childs
|
||||
// .iter()
|
||||
// .map(|v| v.debug_display())
|
||||
// .collect::<Vec<_>>()
|
||||
// .join("\n&&&\n")
|
||||
// );
|
||||
}
|
||||
// This is not good behavious
|
||||
Err(LoadError::EmptyLine) => (),
|
||||
|
|
@ -110,21 +104,21 @@ impl ListId {
|
|||
// _ => return Err(LoadError::LineParseError),
|
||||
}
|
||||
} else {
|
||||
// println!(" Not child");
|
||||
break;
|
||||
} // Else Do Something
|
||||
*index += 1;
|
||||
}
|
||||
}
|
||||
let node = Node::new(name, id, global_id, Some(list_childs), level);
|
||||
println!("Exiting with:\n{}", node.debug_display());
|
||||
// println!("x= Exiting with:\n{}", node.debug_display());
|
||||
Ok(node)
|
||||
}
|
||||
SkillTypes::RepeatingSkills | SkillTypes::RepeatingItem | SkillTypes::SubSkill => {
|
||||
let node = Node::new(name, id, global_id, None, level);
|
||||
println!(
|
||||
"Finished at : index {} with {}",
|
||||
index,
|
||||
node.debug_display()
|
||||
);
|
||||
// println!(
|
||||
// "<= Finished at : index {} with {}",
|
||||
// index,
|
||||
// node.debug_display()
|
||||
// );
|
||||
Ok(node)
|
||||
}
|
||||
SkillTypes::NewLine => Err(LoadError::EmptyLine),
|
||||
|
|
@ -440,21 +434,25 @@ mod test {
|
|||
|
||||
#[test]
|
||||
fn test_node() {
|
||||
// let file_content = "@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@s1\n+ss0\n#ri0\n#ri1\n+ss1\n.rpts0\n.rpts1"
|
||||
// .to_string();
|
||||
let file_content = "@s0\n+ss0\n=sk0\n-sks0".to_string();
|
||||
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+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+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"," [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]"),
|
||||
];
|
||||
|
||||
let line_ids = ListId::from_string(file_content).unwrap();
|
||||
// println!("{:?}", line_ids);
|
||||
let mut index = 0;
|
||||
let node = line_ids.make_node(&mut index, SkillTypes::Section);
|
||||
// println!("{:?}", node);
|
||||
let node = node.unwrap();
|
||||
println!("Final Nodes: \n{}", node.debug_display());
|
||||
// println!("{:?}", node);
|
||||
for (file_content, expected) in test_dt.iter() {
|
||||
println!("::<> Testing for:\n {}", file_content);
|
||||
let line_ids = ListId::from_string(file_content.to_string()).unwrap();
|
||||
let mut index = 0;
|
||||
let node = line_ids.make_node(&mut index, SkillTypes::Section);
|
||||
let node = node.unwrap();
|
||||
println!("Final Nodes: \n{}", node.debug_display());
|
||||
assert_eq!(node.debug_display(), expected.to_string());
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Reference in New Issue