diff --git a/src/bng/score.rs b/src/bng/score.rs index 0595765..3e1f302 100644 --- a/src/bng/score.rs +++ b/src/bng/score.rs @@ -27,9 +27,9 @@ use thiserror::Error; use utils::{inflate, InflateError}; mod lex; -mod ser; +mod serialize; mod utils; -pub use ser::*; +pub use serialize::*; use super::Expression as Instruction; diff --git a/src/bng/score/lex/lexer.rs b/src/bng/score/lex/lexer.rs index 1933b43..762100e 100644 --- a/src/bng/score/lex/lexer.rs +++ b/src/bng/score/lex/lexer.rs @@ -40,11 +40,7 @@ impl Parse for Modifier { pub fn flat_atom_parser(notes: &str) -> impl Parser<&str, FlatAtom, nom::error::Error<&str>> { alt(( - map_res( - map_opt(one_of(notes), |c| notes.find(dbg!(c))), - u8::try_from, - ) - .map(FlatAtom::Note), + map_res(map_opt(one_of(notes), |c| notes.find(c)), u8::try_from).map(FlatAtom::Note), value(FlatAtom::Rest, char(Atom::REST)), value(FlatAtom::StartHere, char(Atom::START_HERE)), preceded(char(Atom::MODIFIER), Modifier::parse).map(FlatAtom::Modifier), diff --git a/src/bng/score/ser.rs b/src/bng/score/serialize.rs similarity index 100% rename from src/bng/score/ser.rs rename to src/bng/score/serialize.rs