fix(varcon)!: Track entry note separate from comment

This commit is contained in:
Ed Page 2024-08-23 10:48:05 -05:00
parent 0d2c99e494
commit 11d6e1d968
4 changed files with 18088 additions and 18088 deletions

View file

@ -21,7 +21,7 @@ pub struct Entry {
pub pos: Option<crate::Pos>, pub pos: Option<crate::Pos>,
pub archaic: bool, pub archaic: bool,
pub description: Option<&'static str>, pub description: Option<&'static str>,
pub note: bool, pub note: Option<&'static str>,
pub comment: Option<&'static str>, pub comment: Option<&'static str>,
} }
@ -31,8 +31,8 @@ impl Entry {
variants: self.variants.iter().map(|v| v.into_owned()).collect(), variants: self.variants.iter().map(|v| v.into_owned()).collect(),
pos: self.pos, pos: self.pos,
archaic: self.archaic, archaic: self.archaic,
note: self.note,
description: self.description.map(|s| s.to_owned()), description: self.description.map(|s| s.to_owned()),
note: self.note.map(|s| s.to_owned()),
comment: self.comment.map(|s| s.to_owned()), comment: self.comment.map(|s| s.to_owned()),
} }
} }

View file

@ -31,7 +31,7 @@ pub struct Entry {
pub pos: Option<Pos>, pub pos: Option<Pos>,
pub archaic: bool, pub archaic: bool,
pub description: Option<String>, pub description: Option<String>,
pub note: bool, pub note: Option<String>,
pub comment: Option<String>, pub comment: Option<String>,
} }

View file

@ -103,7 +103,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -151,7 +151,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -199,7 +199,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
], ],
@ -280,7 +280,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -328,7 +328,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -376,7 +376,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
], ],
@ -432,7 +432,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -480,7 +480,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -528,7 +528,7 @@ A Cv: acknowledgment's / Av B C: acknowledgement's
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
], ],
@ -661,7 +661,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -709,7 +709,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -757,7 +757,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
], ],
@ -842,7 +842,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -890,7 +890,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
Entry { Entry {
@ -938,7 +938,7 @@ Cluster {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}, },
], ],
@ -984,7 +984,7 @@ impl Entry {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
}; };
@ -997,12 +997,12 @@ impl Entry {
let pos = opt((space1, delimited('<', cut_err(Pos::parse_), cut_err('>')))) let pos = opt((space1, delimited('<', cut_err(Pos::parse_), cut_err('>'))))
.parse_next(input)?; .parse_next(input)?;
let archaic = opt((space1, archaic)).parse_next(input)?; let archaic = opt((space1, archaic)).parse_next(input)?;
let note = opt((space1, NOTE_PREFIX)).parse_next(input)?; let note = opt((space1, NOTE_PREFIX, space1, description)).parse_next(input)?;
let description = opt((space1, description)).parse_next(input)?; let description = opt((space1, description)).parse_next(input)?;
entry.pos = pos.map(|(_, p)| p); entry.pos = pos.map(|(_, p)| p);
entry.archaic = archaic.is_some(); entry.archaic = archaic.is_some();
entry.note = note.is_some(); entry.note = note.map(|(_, _, _, d)| d.to_owned());
entry.description = description.map(|(_, d)| d.to_owned()); entry.description = description.map(|(_, d)| d.to_owned());
} }
Ok(entry) Ok(entry)
@ -1093,7 +1093,7 @@ Entry {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
} }
@ -1151,7 +1151,7 @@ Entry {
description: Some( description: Some(
"otherwise", "otherwise",
), ),
note: false, note: None,
comment: None, comment: None,
} }
@ -1223,7 +1223,7 @@ Entry {
), ),
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
} }
@ -1279,7 +1279,7 @@ Entry {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
} }
@ -1323,7 +1323,7 @@ Entry {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: None, comment: None,
} }
@ -1383,7 +1383,7 @@ Entry {
description: Some( description: Some(
"ship", "ship",
), ),
note: false, note: None,
comment: None, comment: None,
} }
@ -1423,10 +1423,10 @@ Entry {
], ],
pos: None, pos: None,
archaic: false, archaic: false,
description: Some( description: None,
note: Some(
"plural", "plural",
), ),
note: true,
comment: None, comment: None,
} }
@ -1490,7 +1490,7 @@ Entry {
pos: None, pos: None,
archaic: false, archaic: false,
description: None, description: None,
note: false, note: None,
comment: Some( comment: Some(
"ODE: archaic, M-W: 'or' but can find little evidence of use", "ODE: archaic, M-W: 'or' but can find little evidence of use",
), ),

File diff suppressed because it is too large Load diff