zaphar/kitchen
1
0
Fork 0
mirror of https://github.com/zaphar/kitchen.git synced 2025-07-22 19:40:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some whitespace parsing bugs

Browse Source
This commit is contained in:
Jeremy Wall 2021-11-23 11:14:31 -05:00
parent 185c55c66b
commit bf633b50d5
2 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
recipes/src/parse.rs
View File

@ -18,6 +18,7 @@ use abortable_parser::{
ascii_digit, consume_all, discard, do_each, either, eoi, make_fn, must, not, optional, peek, ascii_digit, consume_all, discard, do_each, either, eoi, make_fn, must, not, optional, peek,
repeat, separated, text_token, trap, until, Result, StrIter, repeat, separated, text_token, trap, until, Result, StrIter,
}; };
use inflector::Inflector;
use num_rational::Ratio; use num_rational::Ratio;
use crate::{ use crate::{
@ -148,11 +149,17 @@ make_fn!(
); );
make_fn!(ws<StrIter, &str>, make_fn!(ws<StrIter, &str>,
consume_all!(either!( do_each!(
text_token!(" "), _initial => peek!(either!(
text_token!("\t"), text_token!(" "),
text_token!("\r") text_token!("\t"),
)) text_token!("\r"))),
rest => consume_all!(either!(
text_token!(" "),
text_token!("\t"),
text_token!("\r"))),
(rest)
)
); );
make_fn!(nonzero<StrIter, ()>, make_fn!(nonzero<StrIter, ()>,
@ -188,6 +195,10 @@ make_fn!(unit<StrIter, String>,
u => either!( u => either!(
text_token!("tsps"), text_token!("tsps"),
text_token!("tsp"), text_token!("tsp"),
text_token!("teaspoons"),
text_token!("teaspoon"),
text_token!("tablespoons"),
text_token!("tablespoon"),
text_token!("tbsps"), text_token!("tbsps"),
text_token!("tbsp"), text_token!("tbsp"),
text_token!("floz"), text_token!("floz"),
@ -215,7 +226,8 @@ make_fn!(unit<StrIter, String>,
text_token!("gram"), text_token!("gram"),
text_token!("g")), text_token!("g")),
_ => ws, _ => ws,
(u.to_lowercase().to_singular())) (u.to_lowercase().to_singular())
)
); );
make_fn!( make_fn!(
@ -245,12 +257,7 @@ make_fn!(
pub measure_parts<StrIter, (Quantity, Option<String>)>, pub measure_parts<StrIter, (Quantity, Option<String>)>,
do_each!( do_each!(
qty => quantity, qty => quantity,
unit => optional!(do_each!( unit => optional!(unit),
_ => ws,
unit => unit,
(unit)
)),
_ => ws,
((qty, unit)) ((qty, unit))
) )
); );
@ -262,8 +269,8 @@ pub fn measure(i: StrIter) -> abortable_parser::Result<StrIter, Measure> {
return Result::Complete( return Result::Complete(
i.clone(), i.clone(),
unit.map(|s| match s.as_str() { unit.map(|s| match s.as_str() {
"tbsp" => Volume(Tbsp(qty)), "tbsp" | "tablespoon" => Volume(Tbsp(qty)),
"tsp" => Volume(Tsp(qty)), "tsp" | "teaspoon" => Volume(Tsp(qty)),
"floz" => Volume(Floz(qty)), "floz" => Volume(Floz(qty)),
"ml" => Volume(ML(qty)), "ml" => Volume(ML(qty)),
"ltr" | "liter" => Volume(Ltr(qty)), "ltr" | "liter" => Volume(Ltr(qty)),
@ -294,8 +301,6 @@ pub fn measure(i: StrIter) -> abortable_parser::Result<StrIter, Measure> {
} }
} }
use inflector::Inflector;
make_fn!( make_fn!(
pub ingredient_name<StrIter, String>, pub ingredient_name<StrIter, String>,
do_each!( do_each!(

49
recipes/src/test.rs
View File

@ -271,29 +271,38 @@ fn test_ingredient_name_parse() {
#[test] #[test]
fn test_ingredient_parse() { fn test_ingredient_parse() {
for (i, expected) in vec![ for (i, expected) in vec![
//(
// "1 cup flour ",
// Ingredient::new("flour", None, Volume(Cup(Quantity::Whole(1))), ""),
//),
//(
// "\t1 cup flour ",
// Ingredient::new("flour", None, Volume(Cup(Quantity::Whole(1))), ""),
//),
//(
// "1 cup apple (chopped)",
// Ingredient::new(
// "apple",
// Some("chopped".to_owned()),
// Volume(Cup(Quantity::Whole(1))),
// "",
// ),
//),
//(
// "1 cup apple (chopped) ",
// Ingredient::new(
// "apple",
// Some("chopped".to_owned()),
// Volume(Cup(Quantity::Whole(1))),
// "",
// ),
//),
( (
"1 cup flour ", "1 green bell pepper (chopped) ",
Ingredient::new("flour", None, Volume(Cup(Quantity::Whole(1))), ""),
),
(
"\t1 cup flour ",
Ingredient::new("flour", None, Volume(Cup(Quantity::Whole(1))), ""),
),
(
"1 cup apple (chopped)",
Ingredient::new( Ingredient::new(
"apple", "green bell pepper",
Some("chopped".to_owned()), Some("chopped".to_owned()),
Volume(Cup(Quantity::Whole(1))), Count(Quantity::Whole(1)),
"",
),
),
(
"1 cup apple (chopped) ",
Ingredient::new(
"apple",
Some("chopped".to_owned()),
Volume(Cup(Quantity::Whole(1))),
"", "",
), ),
), ),