fix(varcon): Swallow plural annotations

This commit is contained in:
Ed Page 2024-08-23 11:09:59 -05:00
parent 5e00c161a6
commit 3b2dd279b7
2 changed files with 19 additions and 20 deletions

View file

@ -992,7 +992,8 @@ impl Entry {
fn parse_description(input: &mut &str) -> PResult<Self, ()> { fn parse_description(input: &mut &str) -> PResult<Self, ()> {
trace("description", move |input: &mut &str| { trace("description", move |input: &mut &str| {
let (pos, archaic, note, description) = ( let (_plural, pos, archaic, note, description) = (
winnow::combinator::opt((winnow::ascii::space1, "<pl>")),
winnow::combinator::opt((winnow::ascii::space1, delimited('<', Pos::parse_, '>'))), winnow::combinator::opt((winnow::ascii::space1, delimited('<', Pos::parse_, '>'))),
winnow::combinator::opt((winnow::ascii::space1, "(-)")), winnow::combinator::opt((winnow::ascii::space1, "(-)")),
winnow::combinator::opt((winnow::ascii::space1, "--")), winnow::combinator::opt((winnow::ascii::space1, "--")),
@ -1341,9 +1342,7 @@ Entry {
pos: None, pos: None,
archaic: false, archaic: false,
note: false, note: false,
description: Some( description: None,
"<pl>",
),
comment: None, comment: None,
} }

View file

@ -12342,7 +12342,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [analysis]"), description: Some("[analysis]"),
comment: None, comment: None,
}, },
], ],
@ -49134,7 +49134,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [catalysis]"), description: Some("[catalysis]"),
comment: None, comment: None,
}, },
], ],
@ -55294,7 +55294,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> :2"), description: Some(":2"),
comment: None, comment: None,
}, },
], ],
@ -99099,7 +99099,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [dialysis]"), description: Some("[dialysis]"),
comment: None, comment: None,
}, },
], ],
@ -107825,7 +107825,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -183976,7 +183976,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [hydrolysis]"), description: Some("[hydrolysis]"),
comment: None, comment: None,
}, },
], ],
@ -184239,7 +184239,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -195572,7 +195572,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -204163,7 +204163,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -283206,7 +283206,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [paralysis]"), description: Some("[paralysis]"),
comment: None, comment: None,
}, },
], ],
@ -322811,7 +322811,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [psychoanalysis]"), description: Some("[psychoanalysis]"),
comment: None, comment: None,
}, },
], ],
@ -327022,7 +327022,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
], ],
@ -330649,7 +330649,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [reanalysis]"), description: Some("[reanalysis]"),
comment: None, comment: None,
}, },
], ],
@ -397881,7 +397881,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> [topi] antelope"), description: Some("[topi] antelope"),
comment: None, comment: None,
}, },
], ],
@ -447581,7 +447581,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl>"), description: None,
comment: None, comment: None,
}, },
], ],
@ -449137,7 +449137,7 @@ Cluster {
}, },
], ],
pos: None, archaic: false, note: false, pos: None, archaic: false, note: false,
description: Some("<pl> :1"), description: Some(":1"),
comment: None, comment: None,
}, },
Entry { Entry {