Add tests for collections

This commit is contained in:
Savanni D'Gerinel 2023-06-23 00:10:41 -04:00
parent 2469cd78fa
commit 4fd07b240e
1 changed files with 51 additions and 34 deletions

View File

@ -187,9 +187,12 @@ enum PropValue {
Stone, Stone,
} }
pub fn parse_sgf(input: &str) -> Result<GameTree, ParseError> { pub fn parse_sgf(input: &str) -> Result<Vec<GameTree>, ParseError> {
let (_, tree) = parse_tree(input).finish()?; let (_, trees) = parse_collection(input).finish()?;
trees
.into_iter()
.map(|tree| {
let file_format = match tree.sequence[0].find_prop("FF") { let file_format = match tree.sequence[0].find_prop("FF") {
Some(prop) => prop.values[0].parse::<i8>().unwrap(), Some(prop) => prop.values[0].parse::<i8>().unwrap(),
None => 4, None => 4,
@ -216,6 +219,8 @@ pub fn parse_sgf(input: &str) -> Result<GameTree, ParseError> {
board_size, board_size,
text: input.to_owned(), text: input.to_owned(),
}) })
})
.collect()
} }
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
@ -282,11 +287,15 @@ impl ToString for Property {
} }
} }
fn parse_collection(input: &str) -> IResult<&str, Vec<Tree>> {
separated_list1(multispace0, parse_tree)(input)
}
// note: must preserve unknown properties // note: must preserve unknown properties
// note: must fix or preserve illegally formatted game-info properties // note: must fix or preserve illegally formatted game-info properties
// note: must correct or delete illegally foramtted properties, but display a warning // note: must correct or delete illegally foramtted properties, but display a warning
fn parse_tree(input: &str) -> IResult<&str, Tree> { fn parse_tree(input: &str) -> IResult<&str, Tree> {
println!("parse_tree: {}", input); println!(":: parse_tree: {}", input);
let (input, _) = multispace0(input)?; let (input, _) = multispace0(input)?;
delimited(tag("("), parse_sequence, tag(")"))(input) delimited(tag("("), parse_sequence, tag(")"))(input)
} }
@ -307,7 +316,7 @@ fn parse_sequence(input: &str) -> IResult<&str, Tree> {
} }
fn parse_node(input: &str) -> IResult<&str, Node> { fn parse_node(input: &str) -> IResult<&str, Node> {
println!("parse_node: {}", input); println!(":: parse_node: {}", input);
let (input, _) = multispace0(input)?; let (input, _) = multispace0(input)?;
let (input, _) = tag(";")(input)?; let (input, _) = tag(";")(input)?;
let (input, properties) = many1(parse_property)(input)?; let (input, properties) = many1(parse_property)(input)?;
@ -315,7 +324,7 @@ fn parse_node(input: &str) -> IResult<&str, Node> {
} }
fn parse_property(input: &str) -> IResult<&str, Property> { fn parse_property(input: &str) -> IResult<&str, Property> {
println!("parse_property: {}", input); println!(":: parse_property: {}", input);
let (input, _) = multispace0(input)?; let (input, _) = multispace0(input)?;
let (input, ident) = alpha1(input)?; let (input, ident) = alpha1(input)?;
let (input, values) = many1(delimited(tag("["), take_until("]"), tag("]")))(input)?; let (input, values) = many1(delimited(tag("["), take_until("]"), tag("]")))(input)?;
@ -537,7 +546,6 @@ mod tests {
#[test] #[test]
fn it_can_regenerate_the_tree() { fn it_can_regenerate_the_tree() {
let (_, tree1) = parse_tree(EXAMPLE).unwrap(); let (_, tree1) = parse_tree(EXAMPLE).unwrap();
println!("{}", tree1.to_string());
assert_eq!( assert_eq!(
tree1.to_string(), tree1.to_string(),
"(;FF[4]C[root](;C[a];C[b](;C[c])(;C[d];C[e]))(;C[f](;C[g];C[h];C[i])(;C[j])))" "(;FF[4]C[root](;C[a];C[b](;C[c])(;C[d];C[e]))(;C[f](;C[g];C[h];C[i])(;C[j])))"
@ -546,11 +554,11 @@ mod tests {
assert_eq!(tree1, tree2); assert_eq!(tree1, tree2);
} }
fn with_text(text: &str, f: impl FnOnce(GameTree)) { fn with_text(text: &str, f: impl FnOnce(Vec<GameTree>)) {
f(parse_sgf(text).unwrap()); f(parse_sgf(text).unwrap());
} }
fn with_file(path: &std::path::Path, f: impl FnOnce(GameTree)) { fn with_file(path: &std::path::Path, f: impl FnOnce(Vec<GameTree>)) {
let mut file = File::open(path).unwrap(); let mut file = File::open(path).unwrap();
let mut text = String::new(); let mut text = String::new();
let _ = file.read_to_string(&mut text); let _ = file.read_to_string(&mut text);
@ -559,7 +567,9 @@ mod tests {
#[test] #[test]
fn it_parses_game_root() { fn it_parses_game_root() {
with_text(EXAMPLE, |tree| { with_text(EXAMPLE, |trees| {
assert_eq!(trees.len(), 1);
let tree = &trees[0];
assert_eq!(tree.file_format, 4); assert_eq!(tree.file_format, 4);
assert_eq!(tree.app, None); assert_eq!(tree.app, None);
assert_eq!(tree.game_type, GameType::Go); assert_eq!(tree.game_type, GameType::Go);
@ -573,7 +583,9 @@ mod tests {
assert_eq!(tree.text, EXAMPLE.to_owned()); assert_eq!(tree.text, EXAMPLE.to_owned());
}); });
with_file(std::path::Path::new("test_data/print1.sgf"), |tree| { with_file(std::path::Path::new("test_data/print1.sgf"), |trees| {
assert_eq!(trees.len(), 1);
let tree = &trees[0];
assert_eq!(tree.file_format, 4); assert_eq!(tree.file_format, 4);
assert_eq!(tree.app, None); assert_eq!(tree.app, None);
assert_eq!(tree.game_type, GameType::Go); assert_eq!(tree.game_type, GameType::Go);
@ -586,4 +598,9 @@ mod tests {
); );
}); });
} }
#[test]
fn it_parses_ff4_ex() {
with_file(std::path::Path::new("test_data/ff4_ex.sgf"), |tree| {});
}
} }