From 31e70bfc2a92939b2cb4005c194a7db923e342d6 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Wed, 13 Sep 2023 15:48:46 -0400 Subject: [PATCH] Code cleanups --- sgf/src/lib.rs | 10 +++++++--- sgf/src/tree.rs | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sgf/src/lib.rs b/sgf/src/lib.rs index f9a4aad..51e55e8 100644 --- a/sgf/src/lib.rs +++ b/sgf/src/lib.rs @@ -4,7 +4,7 @@ pub use date::Date; // pub mod go; mod tree; -use tree::parse_collection; +use tree::{parse_collection, Tree}; // mod game; @@ -18,8 +18,12 @@ pub enum Game { Go(go::Game), Unsupported(tree::Tree), } +*/ -pub fn parse_sgf(input: &str) -> Result, Error> { +pub fn parse_sgf(input: &str) -> Result, Error> { + let (_, trees) = parse_collection::>(input)?; + Ok(trees) + /* let (_, trees) = parse_collection::>(input)?; Ok(trees .into_iter() @@ -30,8 +34,8 @@ pub fn parse_sgf(input: &str) -> Result, Error> { _ => Game::Unsupported(t), }) .collect::>()) + */ } -*/ /* impl From<(&str, VerboseErrorKind)> for diff --git a/sgf/src/tree.rs b/sgf/src/tree.rs index ddcfced..26f6410 100644 --- a/sgf/src/tree.rs +++ b/sgf/src/tree.rs @@ -2,7 +2,7 @@ use crate::{Color, Error, GameResult}; use nom::{ branch::alt, bytes::complete::{escaped_transform, tag}, - character::complete::{alpha1, digit1, multispace0, multispace1, none_of}, + character::complete::{alpha1, multispace0, multispace1, none_of}, combinator::{opt, value}, multi::{many0, many1, separated_list1}, IResult, @@ -646,6 +646,7 @@ fn parse_propval_text<'a, E: nom::error::ParseError<&'a str>>( Ok((input, value.map(|v| v.to_owned()))) } +/* pub fn parse_size<'a, E: nom::error::ParseError<&'a str>>( input: &'a str, ) -> IResult<&'a str, Size, E> { @@ -660,6 +661,7 @@ pub fn parse_size<'a, E: nom::error::ParseError<&'a str>>( }; Ok((input, Size { width, height })) } +*/ #[cfg(test)] mod test {