Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat: fix "I walks" / "he walk" etc. (#2333)

Andrew Dunbar18f65d7d7135
diff --git a/harper-core/dictionary.dict b/harper-core/dictionary.dict
index 59ac27dd6..1b793049e 100644
--- a/harper-core/dictionary.dict
+++ b/harper-core/dictionary.dict
@@ -16375,7 +16375,7 @@ canning/~V6N
cannon/~NgS09VGdJ # singular and plural, also has a plural in -s
cannonade/NgSVGd
cannonball/~NSgV
-cannot/~VN
+cannot/~VAN
canny/J^>U
canoe/~NgSVd
canoeing/~NV6
@@ -21882,7 +21882,7 @@ done/~JVTNWrU
dong/~NgS09VdG # singular and plural, currency plural is dong or dongs
dongle/NSg
donkey/~NSg
-donned/~V
+donned/~VtT
donning/V6
donnish/J
donnybrook/NgSJ
@@ -28838,7 +28838,7 @@ hundredfold/JV
hundredth/~JN0g
hundredths/N9
hundredweight/NSg
-hung/~VJ
+hung/~VtTJ
hunger/~NmSgVdG
hungover/J
hungrily/Ry
@@ -45585,7 +45585,7 @@ sou'wester/N
souffle/NwSgV
sough/VdGNg
soughs/V
-sought/~VU
+sought/~VtTU
souk/NS
soul/~NwgSV
soulful/JYpN
@@ -50512,6 +50512,7 @@ unseen/~JVNg
unselect/VGdS
unsentimental/J
unset/JV
+unsettlingly/R
unshakable/J
unshakably/Ry
unshakeable/J!_₹
diff --git a/harper-core/irregular_verbs.json b/harper-core/irregular_verbs.json
index 5d710a5c1..5e365186a 100644
--- a/harper-core/irregular_verbs.json
+++ b/harper-core/irregular_verbs.json
@@ -4,6 +4,7 @@
["arise", "arose", "arisen"],
["awake", "awoke", "awoken"],
"// be/am/are/is -- was/were -- been",
+ ["bear", "bore", "born"],
["become", "became", "become"],
["begin", "began", "begun"],
["bend", "bent", "bent"],
@@ -50,12 +51,20 @@
["hurt", "hurt", "hurt"],
["input", "input", "input"],
["keep", "kept", "kept"],
+ ["kneel", "knelt", "knelt"],
["know", "knew", "known"],
- ["lay", "laid", "lain"],
+ "// lay -- laid -- lain",
+ ["lay", "laid", "laid"],
["lead", "led", "led"],
+ ["leave", "left", "left"],
+ ["lend", "lent", "lent"],
+ ["let", "let", "let"],
+ ["lie", "lay", "lain"],
["light", "lit", "lit"],
["lose", "lost", "lost"],
["make", "made", "made"],
+ ["mean", "meant", "meant"],
+ ["meet", "met", "met"],
["mistake", "mistook", "mistaken"],
["output", "output", "output"],
["overtake", "overtook", "overtaken"],
@@ -95,6 +104,7 @@
["slit", "slit", "slit"],
"// sneak -- sneaked/snuck -- sneaked/snuck",
["speak", "spoke", "spoken"],
+ ["spend", "spent", "spent"],
["spin", "spun", "spun"],
["spit", "spat", "spat"],
["split", "split", "split"],
@@ -110,6 +120,8 @@
["string", "strung", "strung"],
["sew", "sewed", "sewn"],
["swear", "swore", "sworn"],
+ ["sweep", "swept", "swept"],
+ ["swell", "swelled", "swollen"],
["swim", "swam", "swum"],
["swing", "swung", "swung"],
["take", "took", "taken"],
@@ -122,6 +134,10 @@
["wake", "woke", "woken"],
["wear", "wore", "worn"],
["weave", "wove", "woven"],
+ ["weep", "wept", "wept"],
+ "// wet -- wetted -- wetted",
+ ["wet", "wet", "wet"],
+ ["win", "won", "won"],
["wind", "wound", "wound"],
["write", "wrote", "written"]
]
diff --git a/harper-core/src/expr/sequence_expr.rs b/harper-core/src/expr/sequence_expr.rs
index 5b7274c63..9d5a00880 100644
--- a/harper-core/src/expr/sequence_expr.rs
+++ b/harper-core/src/expr/sequence_expr.rs
@@ -80,6 +80,11 @@ impl Expr for SequenceExpr {
impl SequenceExpr {
// Constructor methods
+ // Match an [expression](Expr).
+ pub fn with(expr: impl Expr + 'static) -> Self {
+ Self::default().then(expr)
+ }
+
// Single token methods
/// Construct a new sequence with an [`AnyPattern`] at the beginning of the operation list.
@@ -421,9 +426,24 @@ impl SequenceExpr {
})
}
- gen_then_from_is!(sentence_terminator);
// More than two kinds
+ /// Match a token where both of the first two token kind predicates return true,
+ /// and the third returns false.
+ /// For instance, a word that must be both noun and verb, but not adjective.
+ pub fn then_kind_both_but_not<F1, F2, F3>(
+ self,
+ (pred_is_1, pred_is_2): (F1, F2),
+ pred_not: F3,
+ ) -> Self
+ where
+ F1: Fn(&TokenKind) -> bool + Send + Sync + 'static,
+ F2: Fn(&TokenKind) -> bool + Send + Sync + 'static,
+ F3: Fn(&TokenKind) -> bool + Send + Sync + 'static,
+ {
+ self.then_kind_where(move |k| pred_is_1(k) && pred_is_2(k) && !pred_not(k))
+ }
+
/// Match a token where any of the token kind predicates returns true.
/// Like `then_kind_either` but for more than two predicates.
pub fn then_kind_any<F>(self, preds_is: &'static [F]) -> Self
@@ -544,6 +564,7 @@ impl SequenceExpr {
gen_then_from_is!(verb_simple_past_form);
gen_then_from_is!(verb_past_participle_form);
gen_then_from_is!(verb_progressive_form);
+ gen_then_from_is!(verb_third_person_singular_present_form);
// Adjectives
@@ -597,6 +618,7 @@ impl SequenceExpr {
gen_then_from_is!(case_separator);
gen_then_from_is!(likely_homograph);
+ gen_then_from_is!(sentence_terminator);
}
impl<S> From<S> for SequenceExpr
diff --git a/harper-core/src/linting/am_in_the_morning.rs b/harper-core/src/linting/am_in_the_morning.rs
index ac012d715..70dc2415e 100644
--- a/harper-core/src/linting/am_in_the_morning.rs
+++ b/harper-core/src/linting/am_in_the_morning.rs
@@ -16,11 +16,11 @@ impl Default for AmInTheMorning {
let pm = WordSet::new(&["pm", "p.m."]);
let maybe_ws_am = LongestMatchOf::new(vec![
- Box::new(SequenceExpr::default().then(am.clone())),
+ Box::new(SequenceExpr::with(am.clone())),
Box::new(SequenceExpr::default().then_whitespace().then(am)),
]);
let maybe_ws_pm = LongestMatchOf::new(vec![
- Box::new(SequenceExpr::default().then(pm.clone())),
+ Box::new(SequenceExpr::with(pm.clone())),
Box::new(SequenceExpr::default().then_whitespace().then(pm)),
]);
diff --git a/harper-core/src/linting/expand_memory_shorthands.rs b/harper-core/src/linting/expand_memory_shorthands.rs
index 79b9b1e99..28ad1168a 100644
--- a/harper-core/src/linting/expand_memory_shorthands.rs
+++ b/harper-core/src/linting/expand_memory_shorthands.rs
@@ -23,7 +23,7 @@ impl ExpandMemoryShorthands {
SequenceExpr::default()
.then(ImpliesQuantity)
.then_longest_of(vec![
- Box::new(SequenceExpr::default().then(hotwords.clone())),
+ Box::new(SequenceExpr::with(hotwords.clone())),
Box::new(
SequenceExpr::default()
.then(SpaceOrHyphen)
diff --git a/harper-core/src/linting/expand_time_shorthands.rs b/harper-core/src/linting/expand_time_shorthands.rs
index 96340acc0..8b9f10b1b 100644
--- a/harper-core/src/linting/expand_time_shorthands.rs
+++ b/harper-core/src/linting/expand_time_shorthands.rs
@@ -24,7 +24,7 @@ impl ExpandTimeShorthands {
SequenceExpr::default()
.then(ImpliesQuantity)
.then_longest_of(vec![
- Box::new(SequenceExpr::default().then(hotwords.clone())),
+ Box::new(SequenceExpr::with(hotwords.clone())),
Box::new(
SequenceExpr::default()
.then(SpaceOrHyphen)
diff --git a/harper-core/src/linting/lint_group.rs b/harper-core/src/linting/lint_group.rs
index 3abe208df..db1c6c135 100644
--- a/harper-core/src/linting/lint_group.rs
+++ b/harper-core/src/linting/lint_group.rs
@@ -148,6 +148,7 @@ use super::pronoun_are::PronounAre;
use super::pronoun_contraction::PronounContraction;
use super::pronoun_inflection_be::PronounInflectionBe;
use super::pronoun_knew::PronounKnew;
+use super::pronoun_verb_agreement::PronounVerbAgreement;
use super::proper_noun_capitalization_linters;
use super::quantifier_needs_of::QuantifierNeedsOf;
use super::quantifier_numeral_conflict::QuantifierNumeralConflict;
@@ -630,6 +631,12 @@ impl LintGroup {
);
out.config.set_rule_enabled("DisjointPrefixes", true);
+ out.add(
+ "PronounVerbAgreement",
+ PronounVerbAgreement::new(dictionary.clone()),
+ );
+ out.config.set_rule_enabled("PronounVerbAgreement", true);
+
out.add_chunk_expr_linter("TransposedSpace", TransposedSpace::new(dictionary.clone()));
out.config.set_rule_enabled("TransposedSpace", true);
diff --git a/harper-core/src/linting/mass_nouns/mass_plurals.rs b/harper-core/src/linting/mass_nouns/mass_plurals.rs
index 40d87f1ae..757016e66 100644
--- a/harper-core/src/linting/mass_nouns/mass_plurals.rs
+++ b/harper-core/src/linting/mass_nouns/mass_plurals.rs
@@ -19,7 +19,7 @@ where
{
pub fn new(dict: D) -> Self {
let oov = SequenceExpr::default().then_oov();
- let looks_plural = SequenceExpr::default().then(|tok: &Token, src: &[char]| {
+ let looks_plural = SequenceExpr::with(|tok: &Token, src: &[char]| {
tok.span
.get_content(src)
.ends_with_ignore_ascii_case_chars(&['s'])
diff --git a/harper-core/src/linting/mod.rs b/harper-core/src/linting/mod.rs
index 60daa00ce..5e2f3ad28 100644
--- a/harper-core/src/linting/mod.rs
+++ b/harper-core/src/linting/mod.rs
@@ -157,6 +157,7 @@ mod pronoun_are;
mod pronoun_contraction;
mod pronoun_inflection_be;
mod pronoun_knew;
+mod pronoun_verb_agreement;
mod proper_noun_capitalization_linters;
mod quantifier_needs_of;
mod quantifier_numeral_conflict;
diff --git a/harper-core/src/linting/months.rs b/harper-core/src/linting/months.rs
index 19776cfe4..7a2bc6452 100644
--- a/harper-core/src/linting/months.rs
+++ b/harper-core/src/linting/months.rs
@@ -65,7 +65,7 @@ impl Default for Months {
// An Expr that matches either a plain month
// Or an ambiguous month after a disambiguating word
- let month_expr = SequenceExpr::default().then(FirstMatchOf::new(vec![
+ let month_expr = SequenceExpr::with(FirstMatchOf::new(vec![
Box::new(only_months),
Box::new(
SequenceExpr::default()
diff --git a/harper-core/src/linting/on_floor.rs b/harper-core/src/linting/on_floor.rs
index 3a259aec7..c6fa93408 100644
--- a/harper-core/src/linting/on_floor.rs
+++ b/harper-core/src/linting/on_floor.rs
@@ -37,8 +37,8 @@ impl Default for OnFloor {
let stop = Lrc::new(WordSet::new(&["stop", "stopping", "stops", "stopped"]));
let exceptions = Lrc::new(LongestMatchOf::new(vec![
- Box::new(SequenceExpr::default().then(look_up_phrase.clone())),
- Box::new(SequenceExpr::default().then(stop.clone())),
+ Box::new(SequenceExpr::with(look_up_phrase.clone())),
+ Box::new(SequenceExpr::with(stop.clone())),
]));
let pattern = LongestMatchOf::new(vec![
diff --git a/harper-core/src/linting/open_compounds.rs b/harper-core/src/linting/open_compounds.rs
index 8c7623288..1c65f3303 100644
--- a/harper-core/src/linting/open_compounds.rs
+++ b/harper-core/src/linting/open_compounds.rs
@@ -38,7 +38,7 @@ impl Default for OpenCompounds {
for compound in compound_to_phrase.keys().cloned().collect::<Vec<_>>() {
compound_wordset.add(&compound);
}
- let compound = Lrc::new(SequenceExpr::default().then(compound_wordset));
+ let compound = Lrc::new(SequenceExpr::with(compound_wordset));
let with_prev = SequenceExpr::anything().then(compound.clone());
diff --git a/harper-core/src/linting/pronoun_contraction/should_contract.rs b/harper-core/src/linting/pronoun_contraction/should_contract.rs
index baf564ca1..9c0bba2f4 100644
--- a/harper-core/src/linting/pronoun_contraction/should_contract.rs
+++ b/harper-core/src/linting/pronoun_contraction/should_contract.rs
@@ -34,7 +34,7 @@ impl Default for ShouldContract {
.then_adjective(),
);
- let start = SequenceExpr::default().then(AnchorStart).then(cap.clone());
+ let start = SequenceExpr::with(AnchorStart).then(cap.clone());
let mid = SequenceExpr::default()
.then_unless(WordSet::new(&["what"]))
.t_ws()
diff --git a/harper-core/src/linting/pronoun_verb_agreement.rs b/harper-core/src/linting/pronoun_verb_agreement.rs
new file mode 100644
index 000000000..d57bda90c
--- /dev/null
+++ b/harper-core/src/linting/pronoun_verb_agreement.rs
@@ -0,0 +1,657 @@
+use crate::{
+ CharStringExt, Lint, Token, TokenKind,
+ expr::{Expr, FirstMatchOf, SequenceExpr},
+ linting::{ExprLinter, LintKind, Suggestion, expr_linter::Chunk},
+ spell::Dictionary,
+};
+
+static NON_MODAL_AUX: &[&str] = &[
+ "do", "don't", "does", "doesn't", "have", "has", "haven't", "hasn't", "dont", "doesnt",
+ "havent", "hasnt",
+];
+static IRREGULAR: &[(&str, &str)] = &[("don't", "doesn't"), ("have", "has"), ("haven't", "hasn't")];
+static SUBJUNCTIVE: &[&str] = &[
+ // "if" and "that" can take the subjunctive mood: "if he go", "that he go" - as in the US constitution
+ // "if" TODO: "if" is more complicated to support than "that"
+ "that",
+ // Verbs that take the subjunctive mood can omit the "that":
+ "demanded",
+ "demanding",
+ "insisted",
+ "insisting",
+ "recommended",
+ "recommending",
+ "requested",
+ "requesting",
+ "suggested",
+ "suggesting",
+];
+static DITRANSITIVE: &[&str] = &[
+ "give", "gave", "given", "gives", "giving", "lose", "lost", "loses", "losing",
+];
+
+pub struct PronounVerbAgreement<D> {
+ expr: Box<dyn Expr>,
+ dict: D,
+}
+
+impl<D> PronounVerbAgreement<D>
+where
+ D: Dictionary,
+{
+ pub fn new(dict: D) -> Self {
+ // TODO: allowing "you" leads to false positives:
+ // "8 years to give you rewards", "all I can do is give you examples"
+ let non_3p_sing_pres_pron_with_3p_sing_pres_verb = SequenceExpr::default()
+ .then_kind_both_but_not(
+ (
+ TokenKind::is_personal_pronoun,
+ TokenKind::is_subject_pronoun,
+ ),
+ TokenKind::is_third_person_singular_pronoun,
+ )
+ .t_ws()
+ // NOTE: allowing verbs that are also nouns leads to false positives:
+ // "Are they colors or colours?"
+ // "8 years to give you rewards"
+ // "all I can do is give you examples"
+ .then_verb_third_person_singular_present_form();
+
+ // NOTE: But excluding them causes many more false positives:
+ // boxes, does, drops, flies, gets, goes, likes, site, wakes
+ // .then_kind_where(|k| k.is_verb_third_person_singular_present_form() && !k.is_plural_noun());
+
+ let third_person_sing_pres_pron = |t: &Token, _: &[char]| {
+ t.kind.is_subject_pronoun()
+ && !t.kind.is_object_pronoun()
+ && t.kind.is_personal_pronoun()
+ && t.kind.is_third_person_singular_pronoun()
+ && !t.kind.is_plural_pronoun()
+ };
+
+ let verb_lemma = |t: &Token, src: &[char]| {
+ t.kind.is_verb_lemma()
+ && !t.kind.is_verb_third_person_singular_present_form()
+ && !t.kind.is_verb_simple_past_form() // eg. not "put"
+ && !t.kind.is_adverb() // eg. not "even"
+ && !t.kind.is_conjunction() // "and"
+ && (!t.kind.is_auxiliary_verb() // "I go"≠"he goes" but "I can"="he can"
+ // We don't want modals because they don't inflect, but we want the other auxiliaries.
+ || t.span.get_content(src).eq_any_ignore_ascii_case_str(NON_MODAL_AUX))
+ };
+
+ Self {
+ expr: Box::new(FirstMatchOf::new(vec![
+ // One Expr for the "I walks" type:
+ Box::new(non_3p_sing_pres_pron_with_3p_sing_pres_verb),
+ // Two Expr's for the "he walk" type:
+ Box::new(
+ SequenceExpr::with(third_person_sing_pres_pron)
+ .t_ws()
+ .then(verb_lemma),
+ ),
+ Box::new(SequenceExpr::aco("it").t_ws().t_aco("don't")),
+ ])),
+ dict,
+ }
+ }
+
+ fn third_person_singular_present_to_lemma(&self, form: &[char]) -> Vec<Vec<char>> {
+ let mut words: Vec<Vec<char>> = Vec::new();
+
+ // -s
+ if form.ends_with_ignore_ascii_case_chars(&['s']) {
+ words.push(form[0..form.len() - 1].to_vec());
+
+ // -es
+ if form.ends_with_ignore_ascii_case_chars(&['e', 's']) {
+ words.push(form[0..form.len() - 2].to_vec());
+
+ // -ies -> -y
+ if form.ends_with_ignore_ascii_case_chars(&['i', 'e', 's']) {
+ words.push(
+ format!("{}y", &form[0..form.len() - 3].iter().collect::<String>())
+ .chars()
+ .collect(),
+ );
+ }
+ }
+ }
+
+ if let Some((lemma, _)) = IRREGULAR
+ .iter()
+ .find(|(_, f)| form.eq_ignore_ascii_case_str(f))
+ {
+ words.push(lemma.chars().collect::<Vec<char>>());
+ }
+
+ words
+ .iter()
+ .filter(|&w| {
+ self.dict
+ .get_word_metadata(w)
+ .is_some_and(|md| md.is_verb_lemma())
+ })
+ .map(|w| w.to_vec())
+ .collect()
+ }
+
+ fn lemma_to_third_person_singular_present(&self, input: &str) -> Vec<Vec<char>> {
+ let mut words: Vec<Vec<char>> = Vec::new();
+
+ words.push(format!("{input}s").chars().collect());
+ words.push(format!("{input}es").chars().collect());
+
+ if input.ends_with("y") {
+ words.push(
+ format!("{}ies", &input[0..input.len() - 1])
+ .chars()
+ .collect(),
+ );
+ }
+
+ if let Some((_, form)) = IRREGULAR
+ .iter()
+ .find(|(lemma, _)| input.eq_ignore_ascii_case(lemma))
+ {
+ words.push(form.chars().collect());
+ }
+
+ words
+ .iter()
+ .filter(|&w| {
+ self.dict
+ .get_word_metadata(w)
+ .is_some_and(|md| md.is_verb_third_person_singular_present_form())
+ })
+ .map(|w| w.to_vec())
+ .collect()
+ }
+}
+
+impl<D> ExprLinter for PronounVerbAgreement<D>
+where
+ D: Dictionary,
+{
+ type Unit = Chunk;
+
+ fn expr(&self) -> &dyn Expr {
+ self.expr.as_ref()
+ }
+
+ fn match_to_lint_with_context(
+ &self,
+ toks: &[Token],
+ src: &[char],
+ ctx: Option<(&[Token], &[Token])>,
+ ) -> Option<Lint> {
+ let pron_tok = &toks[0];
+ let is_3psg = pron_tok.kind.is_third_person_singular_pronoun();
+
+ let verb_tok = toks.last()?;
+
+ if let Some((before, _)) = ctx
+ && let [.., prev_word_tok, ws_tok] = before
+ && ws_tok.kind.is_whitespace()
+ {
+ let prev_word = prev_word_tok.span.get_content(src);
+ let is_exempt = if is_3psg {
+ prev_word_tok.kind.is_auxiliary_verb()
+ || prev_word.eq_any_ignore_ascii_case_str(SUBJUNCTIVE)
+ } else if pron_tok.kind.is_subject_pronoun() {
+ // Clause structure: (... in you) is ... ≠ you is
+ // Look for "true" prepositions, not ones that are more like adverbial particles
+ prev_word_tok.kind.is_preposition() && !prev_word.eq_ignore_ascii_case_str("up")
+ // When the verb is ditransitive, the pronoun is object case, the verb position is actually a noun
+ || (prev_word.eq_any_ignore_ascii_case_str(DITRANSITIVE) && verb_tok.kind.is_noun())
+ } else {
+ false
+ };
+
+ if is_exempt {
+ return None;
+ }
+ }
+
+ let verb_span = verb_tok.span;
+ let verb_chars = verb_tok.span.get_content(src);
+ let verb_str = verb_tok.span.get_content_string(src);
+
+ let suggs = if is_3psg {
+ self.lemma_to_third_person_singular_present(&verb_str)
+ } else {
+ self.third_person_singular_present_to_lemma(verb_chars)
+ };
+
+ let suggestions = suggs
+ .into_iter()
+ .map(|s| Suggestion::replace_with_match_case(s, verb_chars))
+ .collect();
+
+ Some(Lint {
+ span: verb_span,
+ lint_kind: LintKind::Agreement,
+ suggestions,
+ message: "The form of the verb must agree in grammatical number with the pronoun."
+ .to_string(),
+ ..Default::default()
+ })
+ }
+
+ fn description(&self) -> &str {
+ "Ensures pronouns agree with their verbs."
+ }
+}
+
+#[cfg(test)]
+mod lints {
+ use super::PronounVerbAgreement;
+ use crate::linting::tests::{
+ assert_no_lints, assert_suggestion_result, assert_top3_suggestion_result,
+ };
+ use crate::spell::FstDictionary;
+
+ // Expected to be fixed, but there are exceptions
+
+ #[test]
+ fn issue_233_1() {
+ assert_suggestion_result(
+ "I likes this place.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "I like this place.",
+ );
+ }
+
+ #[test]
+ fn issue_233_2() {
+ assert_suggestion_result(
+ "I sits under the AC.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "I sit under the AC.",
+ );
+ }
+
+ #[test]
+ #[ignore = "because 'like' is an adjective as well as a verb."]
+ fn issue_233_1_reverse() {
+ assert_suggestion_result(
+ "He like this place.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He likes this place.",
+ );
+ }
+
+ #[test]
+ fn why_we_cant_flag_like_yet() {
+ assert_no_lints(
+ "What is he like?",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn issue_233_2_reverse() {
+ assert_top3_suggestion_result(
+ "She sit under the AC.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "She sits under the AC.",
+ );
+ }
+
+ #[test]
+ fn dont_flag_correct_agreement() {
+ assert_no_lints(
+ "He likes this place. I sit under the AC.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ // Every pronoun systematically
+
+ // Expected to get corrected
+
+ #[test]
+ fn fixes_i() {
+ assert_suggestion_result(
+ "I wakes up.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "I wake up.",
+ );
+ }
+
+ #[test]
+ fn fixes_we() {
+ assert_suggestion_result(
+ "We gets dressed.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "We get dressed.",
+ );
+ }
+
+ #[test]
+ fn fixes_you() {
+ assert_suggestion_result(
+ "You drops off the kids.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "You drop off the kids.",
+ );
+ }
+
+ #[test]
+ fn fixes_he() {
+ assert_suggestion_result(
+ "He work hard.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He works hard.",
+ );
+ }
+
+ #[test]
+ fn fixes_she() {
+ assert_suggestion_result(
+ "She study hard.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "She studies hard.",
+ );
+ }
+
+ #[test]
+ #[ignore = "Becasue 'it' is also object case. Eg. 'watch it break down'"]
+ fn we_cant_fix_it_yet() {
+ assert_suggestion_result(
+ "It break down.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "It breaks down.",
+ );
+ }
+
+ #[test]
+ fn why_we_cant_fix_it_yet() {
+ assert_no_lints(
+ "I heard it break down.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn fixes_they() {
+ assert_suggestion_result(
+ "They repairs it.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "They repair it.",
+ )
+ }
+
+ // Correct phrases that are expected not to get corrected
+
+ #[test]
+ fn dont_flag_i() {
+ assert_no_lints("I eat", PronounVerbAgreement::new(FstDictionary::curated()));
+ }
+
+ #[test]
+ fn dont_flag_we() {
+ assert_no_lints(
+ "We drink",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn dont_flag_you() {
+ assert_no_lints(
+ "You walk",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn dont_flag_he() {
+ assert_no_lints(
+ "He runs",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn dont_flag_she() {
+ assert_no_lints(
+ "She swims",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn dont_flag_it() {
+ assert_no_lints(
+ "It works!",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn dont_flag_they() {
+ assert_no_lints(
+ "They finish",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ // Ceck changing verb endings
+
+ // -ies ↔ -y
+ #[test]
+ fn fix_flies() {
+ assert_suggestion_result(
+ "I flies",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "I fly",
+ );
+ }
+ #[test]
+ fn fix_cry() {
+ assert_suggestion_result(
+ "He cry",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He cries",
+ );
+ }
+
+ // -o ↔ -oes
+ #[test]
+ fn fix_go() {
+ assert_suggestion_result(
+ "She go",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "She goes",
+ );
+ }
+ #[test]
+ fn fix_goes() {
+ assert_suggestion_result(
+ "They goes",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "They go",
+ );
+ }
+
+ // Check irregular changes
+
+ // has ↔ have
+ #[test]
+ fn fix_has() {
+ assert_suggestion_result(
+ "You has",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "You have",
+ );
+ }
+ #[test]
+ fn fix_have() {
+ assert_suggestion_result(
+ "She have",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "She has",
+ );
+ }
+
+ // hasn't ↔ haven't
+ #[test]
+ fn fix_hasnt() {
+ assert_suggestion_result(
+ "You hasn't",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "You haven't",
+ );
+ }
+ #[test]
+ fn fix_havent() {
+ assert_suggestion_result(
+ "He haven't",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He hasn't",
+ );
+ }
+
+ // -es
+ #[test]
+ fn fix_box() {
+ assert_suggestion_result(
+ "He box",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He boxes",
+ );
+ }
+ #[test]
+ fn fix_boxes() {
+ assert_suggestion_result(
+ "You boxes",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "You box",
+ );
+ }
+
+ // TODO: Are there any double consonant endings to change?
+ // TODO: Are there any f ↔ v endings to change?
+
+ // Negative contractions
+
+ // doesn't ↔ don't
+ #[test]
+ fn fix_doesnt() {
+ assert_suggestion_result(
+ "We doesn't",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "We don't",
+ );
+ }
+ #[test]
+ // Note: This requires a dedicated branch of the `[Expr]`
+ fn fix_dont() {
+ assert_suggestion_result(
+ "It don't",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "It doesn't",
+ );
+ }
+
+ // Does do ↔ does behave differently to box ↔ boxes due to being an auxiliary verb?
+ #[test]
+ fn fix_do() {
+ assert_suggestion_result(
+ "He do",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "He does",
+ );
+ }
+ #[test]
+ fn fix_does() {
+ assert_suggestion_result(
+ "You does",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ "You do",
+ );
+ }
+
+ // False positives found by Elijah
+
+ #[test]
+ fn false_positive_she_consider() {
+ assert_no_lints(
+ "On April 10th, I suggested she consider a smaller, more intimate gathering.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_she_sell() {
+ assert_no_lints(
+ "I suggested she sell it and use the proceeds to help with her relocation expenses, or perhaps rent a similar camera while in Barcelona.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_she_rent() {
+ assert_no_lints(
+ "I suggested she sell it and use the proceeds to help with her relocation expenses, or perhaps rent a similar camera while in Barcelona.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_he_donned() {
+ assert_no_lints(
+ "He donned his heavy oilskins and descended the winding staircase, his boots echoing in the hollow tower.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_he_cannot() {
+ assert_no_lints(
+ "Surely, he cannot offer the same sum as the developers.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_insisting_she_return() {
+ assert_no_lints(
+ "Am I the asshole for insisting she return the dress?",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_pride_in_you_is() {
+ assert_no_lints(
+ "It’s also important to recognize that your family's pride in you is a genuine reflection of your value.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_she_sought() {
+ assert_no_lints(
+ "She sought out Mrs. Hawthorne, the village’s oldest resident, a woman known for her vast knowledge of local history and her unsettlingly accurate intuition.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_lose_you_points() {
+ assert_no_lints(
+ "I admire your dedication to consistently drafting players who are actively trying to lose you points.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+
+ #[test]
+ fn false_positive_she_hung_up() {
+ assert_no_lints(
+ "When I reiterated the conditions I'd previously set, she hung up on me.",
+ PronounVerbAgreement::new(FstDictionary::curated()),
+ );
+ }
+}
diff --git a/harper-core/src/linting/to_two_too/to_too_pronoun_end.rs b/harper-core/src/linting/to_two_too/to_too_pronoun_end.rs
index eb924b3f4..f78b339f4 100644
--- a/harper-core/src/linting/to_two_too/to_too_pronoun_end.rs
+++ b/harper-core/src/linting/to_two_too/to_too_pronoun_end.rs
@@ -18,7 +18,7 @@ impl Default for ToTooPronounEnd {
// "leave it to." where `it` is an object pronoun.
let expr = SequenceExpr::default()
.then_any_of(vec![
- Box::new(SequenceExpr::default().then(AnchorStart)),
+ Box::new(SequenceExpr::with(AnchorStart)),
Box::new(
SequenceExpr::default()
.then_kind_is_but_is_not_except(
diff --git a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
index e9da3d20c..35dc1481a 100644
--- a/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
+++ b/harper-core/tests/text/linters/Alice's Adventures in Wonderland.snap.yml
@@ -1314,6 +1314,16 @@ Message: |
+Lint: Agreement (127 priority)
+Message: |
+ 713 | flustered to tell you—all I know is, something comes at me like a
+ 714 | Jack-in-the-box, and up I goes like a sky-rocket!”
+ | ^~~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “go”
+
+
+
Lint: Spelling (63 priority)
Message: |
723 | minute or two, they began moving about again, and Alice heard the Rabbit say, “A
@@ -1888,16 +1898,6 @@ Message: |
-Lint: Grammar (127 priority)
-Message: |
- 1379 | “I didn’t know it was your table,” said Alice; “it’s laid for a great many more
- | ^~~~ Use the past participle `lain` instead of `laid` when using compound tenses or passive voice.
- 1380 | than three.”
-Suggest:
- - Replace with: “lain”
-
-
-
Lint: Miscellaneous (31 priority)
Message: |
1415 | dropped, and the party sat silent for a minute, while Alice thought over all she
@@ -2568,6 +2568,16 @@ Suggest:
+Lint: Agreement (127 priority)
+Message: |
+ 2121 | “This here young lady,” said the Gryphon, “she wants for to know your history,
+ 2122 | she do.”
+ | ^~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “does”
+
+
+
Lint: Spelling (63 priority)
Message: |
2133 | These words were followed by a very long silence, broken only by an occasional
diff --git a/harper-core/tests/text/linters/The Constitution of the United States.snap.yml b/harper-core/tests/text/linters/The Constitution of the United States.snap.yml
index 0a98724ef..168a3e042 100644
--- a/harper-core/tests/text/linters/The Constitution of the United States.snap.yml
+++ b/harper-core/tests/text/linters/The Constitution of the United States.snap.yml
@@ -514,6 +514,15 @@ Suggest:
+Lint: Agreement (127 priority)
+Message: |
+ 179 | States; If he approve he shall sign it, but if not he shall return it, with his
+ | ^~~~~~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “approves”
+
+
+
Lint: Readability (127 priority)
Message: |
181 | Objections at large on their Journal, and proceed to reconsider it. If after
@@ -752,25 +761,6 @@ Suggest:
-Lint: Grammar (127 priority)
-Message: |
- 276 | No Capitation, or other direct, Tax shall be laid, unless in Proportion to the
- | ^~~~ Use the past participle `lain` instead of `laid` when using compound tenses or passive voice.
- 277 | Census or Enumeration herein before directed to be taken. Congress shall have
-Suggest:
- - Replace with: “lain”
-
-
-
-Lint: Grammar (127 priority)
-Message: |
- 282 | No Tax or Duty shall be laid on Articles exported from any State.
- | ^~~~ Use the past participle `lain` instead of `laid` when using compound tenses or passive voice.
-Suggest:
- - Replace with: “lain”
-
-
-
Lint: Readability (127 priority)
Message: |
284 | No Preference shall be given by any Regulation of Commerce or Revenue to the
@@ -1317,6 +1307,15 @@ Message: |
+Lint: Agreement (127 priority)
+Message: |
+ 454 | Before he enter on the Execution of his Office, he shall take the following
+ | ^~~~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “enters”
+
+
+
Lint: Formatting (63 priority)
Message: |
455 | Oath or Affirmation:-- "I do solemnly swear (or affirm) that I will faithfully
diff --git a/harper-core/tests/text/linters/The Great Gatsby.snap.yml b/harper-core/tests/text/linters/The Great Gatsby.snap.yml
index 4d0dad31c..9f950d3e2 100644
--- a/harper-core/tests/text/linters/The Great Gatsby.snap.yml
+++ b/harper-core/tests/text/linters/The Great Gatsby.snap.yml
@@ -7461,6 +7461,15 @@ Suggest:
+Lint: Agreement (127 priority)
+Message: |
+ 5507 | First time I saw him was when he come into Winebrenner’s poolroom at Forty-third
+ | ^~~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “comes”
+
+
+
Lint: Spelling (63 priority)
Message: |
5507 | First time I saw him was when he come into Winebrenner’s poolroom at Forty-third
@@ -7550,6 +7559,15 @@ Suggest:
+Lint: Agreement (127 priority)
+Message: |
+ 5575 | “He come out to see me two years ago and bought me the house I live in now. Of
+ | ^~~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “comes”
+
+
+
Lint: Agreement (30 priority)
Message: |
5575 | “He come out to see me two years ago and bought me the house I live in now. Of
@@ -7570,6 +7588,16 @@ Suggest:
+Lint: Agreement (127 priority)
+Message: |
+ 5575 | “He come out to see me two years ago and bought me the house I live in now. Of
+ 5576 | course we was broke up when he run off from home, but I see now there was a
+ | ^~~ The form of the verb must agree in grammatical number with the pronoun.
+Suggest:
+ - Replace with: “runs”
+
+
+
Lint: Spelling (63 priority)
Message: |
5582 | pocket a ragged old copy of a book called “Hopalong Cassidy.”
diff --git a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
index c58a6fb76..b9b3a1e1a 100644
--- a/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
+++ b/harper-core/tests/text/tagged/Alice's Adventures in Wonderland.md
@@ -81,7 +81,7 @@
> noticed that they were filled with cupboards and book - shelves ; here and there
# VP/J NSg/I/C/Ddem IPl+ NSg/VPt VP/J P NPl/V3 VB/C NSg/VB+ . NPl/V3+ . J/R VB/C R+
> she saw maps and pictures hung upon pegs . She took down a jar from one of the
-# ISg+ NSg/VPt NPl/V3 VB/C NPl/V3+ NPr/VB/J P NPl/V3 . ISg+ VPt N🅪Sg/VB/J/P D/P+ NSg/VB+ P NSg/I/J P D+
+# ISg+ NSg/VPt NPl/V3 VB/C NPl/V3+ NPr/VP/J P NPl/V3 . ISg+ VPt N🅪Sg/VB/J/P D/P+ NSg/VB+ P NSg/I/J P D+
> shelves as she passed ; it was labelled “ ORANGE MARMALADE ” , but to her great
# NPl/V3+ R/C/P ISg+ VP/J . NPr/ISg+ VPt VB/J/Comm . NPr🅪Sg/VB/J Nᴹ/VB . . NSg/C/P P ISg/D$+ NSg/J
> disappointment it was empty : she did not like to drop the jar for fear of
@@ -5516,8 +5516,8 @@
# VP/J NSg/P NSg/C VB/C NSg/VBP NSg/VB/J P D NSg/VB/J+ . NSg/VB+ . NPr/C IPl+ VXB NSg/VB .
>
#
-> “ The trial cannot proceed , ” said the King in a very grave voice , “ until all the
-# . D+ NSg/VB/J+ NSg/VB VB . . VP/J D NPr/VB/J+ NPr/J/R/P D/P J/R NSg/VB/J+ NSg/VB+ . . C/P NSg/I/J/C/Dq D
+> “ The trial cannot proceed , ” said the King in a very grave voice , “ until all the
+# . D+ NSg/VB/J+ NSg/VXB VB . . VP/J D NPr/VB/J+ NPr/J/R/P D/P J/R NSg/VB/J+ NSg/VB+ . . C/P NSg/I/J/C/Dq D
> jurymen are back in their proper places — all , ” he repeated with great emphasis ,
# NPl VB NSg/VB/J NPr/J/R/P D$+ NSg/J NPl/V3+ . NSg/I/J/C/Dq . . NPr/ISg+ VP/J P NSg/J NSg+ .
> looking hard at Alice as he said so .
diff --git a/harper-core/tests/text/tagged/Computer science.md b/harper-core/tests/text/tagged/Computer science.md
index 3eddd2c8b..5fdea44a2 100644
--- a/harper-core/tests/text/tagged/Computer science.md
+++ b/harper-core/tests/text/tagged/Computer science.md
@@ -59,7 +59,7 @@
>
#
> The fundamental concern of computer science is determining what can and cannot
-# D NSg/J N🅪Sg/VB P NSg/VB+ N🅪Sg/VB+ VL3 Nᴹ/Vg/J NSg/I+ NPr/VXB VB/C NSg/VB
+# D NSg/J N🅪Sg/VB P NSg/VB+ N🅪Sg/VB+ VL3 Nᴹ/Vg/J NSg/I+ NPr/VXB VB/C NSg/VXB
> be automated . The Turing Award is generally recognized as the highest
# NSg/VXB VP/J . D NPr NSg/VB+ VL3 R VP/J R/C/P D JS
> distinction in computer science .
diff --git a/harper-core/tests/text/tagged/Part-of-speech tagging.md b/harper-core/tests/text/tagged/Part-of-speech tagging.md
index 913302ec7..133259c9b 100644
--- a/harper-core/tests/text/tagged/Part-of-speech tagging.md
+++ b/harper-core/tests/text/tagged/Part-of-speech tagging.md
@@ -188,8 +188,8 @@
# I/C+ VP/J P D/P J NSg/J NSg/VB P NSg/I+ NPl+ NSg/VXB NPr/I/VB+ . VB NSg/P
> all . For example , article then noun can occur , but article then verb ( arguably )
# NSg/I/J/C/Dq . R/C/P NSg/VB+ . NSg/VB+ NSg/J/R/C NSg/VB+ NPr/VXB VB . NSg/C/P NSg/VB+ NSg/J/R/C NSg/VB+ . R .
-> cannot . The program got about 70 % correct . Its results were repeatedly reviewed
-# NSg/VB . D+ NPr/VB+ VP J/P # . NSg/VB/J . ISg/D$+ NPl/V3+ NSg/VPt R VP/J
+> cannot . The program got about 70 % correct . Its results were repeatedly reviewed
+# NSg/VXB . D+ NPr/VB+ VP J/P # . NSg/VB/J . ISg/D$+ NPl/V3+ NSg/VPt R VP/J
> and corrected by hand , and later users sent in errata so that by the late 70 s
# VB/C VP/J NSg/P NSg/VB+ . VB/C JC NPl+ NSg/VP NPr/J/R/P NSg NSg/I/J/R/C NSg/I/C/Ddem+ NSg/P D NSg/J # ?
> the tagging was nearly perfect ( allowing for some cases on which even human
@@ -218,8 +218,8 @@
# R/C/P I/J/R/Dq N🅪Sg/VB/J+ . NSg/VB/J+ . P . N🅪Sg/VB+ NSg/Vg VPt VP/J D/P NSg/J NSg/VB/J P
> natural language processing , because there are certain cases where the correct
# NSg/J N🅪Sg/VB+ Nᴹ/Vg/J+ . C/P R+ VB I/J NPl/V3+ NSg/R/C D NSg/VB/J
-> part of speech cannot be decided without understanding the semantics or even the
-# NSg/VB/J P N🅪Sg/VB+ NSg/VB NSg/VXB NSg/VP/J C/P N🅪Sg/Vg/J+ D NPl+ NPr/C NSg/VB/J/R D
+> part of speech cannot be decided without understanding the semantics or even the
+# NSg/VB/J P N🅪Sg/VB+ NSg/VXB NSg/VXB NSg/VP/J C/P N🅪Sg/Vg/J+ D NPl+ NPr/C NSg/VB/J/R D
> pragmatics of the context . This is extremely expensive , especially because
# NPl P D N🅪Sg/VB+ . I/Ddem+ VL3 R J . R C/P
> analyzing the higher levels is much harder when multiple part - of - speech
diff --git a/harper-core/tests/text/tagged/The Constitution of the United States.md b/harper-core/tests/text/tagged/The Constitution of the United States.md
index 6774af2fb..9b1a2aa20 100644
--- a/harper-core/tests/text/tagged/The Constitution of the United States.md
+++ b/harper-core/tests/text/tagged/The Constitution of the United States.md
@@ -1350,8 +1350,8 @@
# D/P NSg/J N🅪Sg/VB P N🅪Sg+ . VB/C VXB VB Dq P NSg/IPl+ C/P
> Invasion ; and on Application of the Legislature , or of the Executive ( when the
# NSg+ . VB/C J/P NSg P D+ NSg+ . NPr/C P D NSg/J . NSg/I/C D+
-> Legislature cannot be convened ) against domestic Violence .
-# NSg+ NSg/VB NSg/VXB VP/J . C/P NSg/J Nᴹ/VB+ .
+> Legislature cannot be convened ) against domestic Violence .
+# NSg+ NSg/VXB NSg/VXB VP/J . C/P NSg/J Nᴹ/VB+ .
>
#
> Section . 5 .
diff --git a/harper-core/tests/text/tagged/The Great Gatsby.md b/harper-core/tests/text/tagged/The Great Gatsby.md
index 5719eec58..c267072cb 100644
--- a/harper-core/tests/text/tagged/The Great Gatsby.md
+++ b/harper-core/tests/text/tagged/The Great Gatsby.md
@@ -37,7 +37,7 @@
> unjustly accused of being a politician , because I was privy to the secret griefs
# R VP/J P N🅪Sg/Vg/J/C D/P NSg+ . C/P ISg/#r+ VPt NSg/J P D NSg/VB/J NPl/V3
> of wild , unknown men . Most of the confidences were unsought — frequently I have
-# P NSg/VB/J . NSg/VB/J NPl+ . NSg/I/J/R/Dq P D NPl NSg/VPt VB . R ISg/#r+ NSg/VXB
+# P NSg/VB/J . NSg/VB/J NPl+ . NSg/I/J/R/Dq P D NPl NSg/VPt VP . R ISg/#r+ NSg/VXB
> feigned sleep , preoccupation , or a hostile levity when I realized by some
# VP/J N🅪Sg/VB+ . NSg . NPr/C D/P NSg/J Nᴹ NSg/I/C ISg/#r+ VP/J/NoAm NSg/P I/J/R/Dq
> unmistakable sign that an intimate revelation was quivering on the horizon ; for
@@ -5803,7 +5803,7 @@
> darkness . A large photograph of an elderly man in yachting costume attracted me ,
# Nᴹ+ . D/P NSg/J NSg/VB P D/P+ R+ NPr/VB/J+ NPr/J/R/P Nᴹ/Vg/J NSg/VB VP/J NPr/ISg+ .
> hung on the wall over his desk .
-# NPr/VB/J J/P D NPr/VB+ NSg/J/P ISg/D$+ NSg/VB+ .
+# NPr/VP/J J/P D NPr/VB+ NSg/J/P ISg/D$+ NSg/VB+ .
>
#
> “ Who’s this ? ”
@@ -6815,7 +6815,7 @@
>
#
> Her glance left me and sought the lighted top of the steps , where “ Three o’Clock
-# ISg/D$+ NSg/VB+ NPr/VP/J NPr/ISg+ VB/C VB D VP/J NSg/VB/J P D+ NPl/V3+ . NSg/R/C . NSg R
+# ISg/D$+ NSg/VB+ NPr/VP/J NPr/ISg+ VB/C VP D VP/J NSg/VB/J P D+ NPl/V3+ . NSg/R/C . NSg R
> in the Morning , ” a neat , sad little waltz of that year , was drifting out the
# NPr/J/R/P D+ N🅪Sg/Vg/J+ . . D/P J . NSg/VB/J NPr/I/J/Dq NSg/VB P NSg/I/C/Ddem NSg+ . VPt Nᴹ/Vg/J NSg/VB/J/R/P D
> open door . After all , in the very casualness of Gatsby’s party there were
@@ -10007,7 +10007,7 @@
> We talked like that for a while , and then abruptly we weren’t talking any
# IPl+ VP/J NSg/VB/J/C/P NSg/I/C/Ddem R/C/P D/P+ NSg/VB/C/P+ . VB/C NSg/J/R/C R IPl+ VPt Nᴹ/Vg/J I/R/Dq
> longer . I don’t know which of us hung up with a sharp click , but I know I didn’t
-# NSg/JC . ISg/#r+ VXB NSg/VB I/C P NPr/IPl+ NPr/VB/J NSg/VB/J/P P D/P NPr/VB/J NSg/VB+ . NSg/C/P ISg/#r+ NSg/VB ISg/#r+ VXPt
+# NSg/JC . ISg/#r+ VXB NSg/VB I/C P NPr/IPl+ NPr/VP/J NSg/VB/J/P P D/P NPr/VB/J NSg/VB+ . NSg/C/P ISg/#r+ NSg/VB ISg/#r+ VXPt
> care . I couldn’t have talked to her across a tea - table that day if I never
# N🅪Sg/VB+ . ISg/#r+ VXB NSg/VXB VP/J P ISg/D$+ NSg/P D/P N🅪Sg/VB+ . NSg/VB+ NSg/I/C/Ddem+ NPr🅪Sg+ NSg/C ISg/#r+ R
> talked to her again in this world .
@@ -10626,10 +10626,10 @@
# NSg/VB/J+ NSg+ . ? . I/Ddem+ V3 NSg/VPp NSg/I/J P D NSg/I/J/R/Dq J NPl P D$+ N🅪Sg/VB+ P
> me I hardly can believe it that it is true at all . Such a mad act as that man
# NPr/ISg+ ISg/#r+ R NPr/VXB VB NPr/ISg+ NSg/I/C/Ddem NPr/ISg+ VL3 NSg/VB/J NSg/P NSg/I/J/C/Dq . NSg/I D/P NSg/VB/J NPr/VB+ R/C/P NSg/I/C/Ddem NPr/VB/J+
-> did should make us all think . I cannot come down now as I am tied up in some
-# VXPt VXB NSg/VB NPr/IPl+ NSg/I/J/C/Dq+ NSg/VB+ . ISg/#r+ NSg/VB NSg/VBPp/P N🅪Sg/VB/J/P NSg/J/R/C R/C/P ISg/#r+ NPr/VB/J VP/J NSg/VB/J/P NPr/J/R/P I/J/R/Dq
-> very important business and cannot get mixed up in this thing now . If there is
-# J/R J N🅪Sg/J+ VB/C NSg/VB NSg/VB VP/J NSg/VB/J/P NPr/J/R/P I/Ddem NSg+ NSg/J/R/C . NSg/C R+ VL3
+> did should make us all think . I cannot come down now as I am tied up in some
+# VXPt VXB NSg/VB NPr/IPl+ NSg/I/J/C/Dq+ NSg/VB+ . ISg/#r+ NSg/VXB NSg/VBPp/P N🅪Sg/VB/J/P NSg/J/R/C R/C/P ISg/#r+ NPr/VB/J VP/J NSg/VB/J/P NPr/J/R/P I/J/R/Dq
+> very important business and cannot get mixed up in this thing now . If there is
+# J/R J N🅪Sg/J+ VB/C NSg/VXB NSg/VB VP/J NSg/VB/J/P NPr/J/R/P I/Ddem NSg+ NSg/J/R/C . NSg/C R+ VL3
> anything I can do a little later let me know in a letter by Edgar . I hardly know
# NSg/I/VB+ ISg/#r+ NPr/VXB VXB D/P NPr/I/J/Dq JC NSg/VBP NPr/ISg+ NSg/VB NPr/J/R/P D/P NSg/VB+ NSg/P NPr+ . ISg/#r+ R NSg/VB
> where I am when I hear about a thing like this and am completely knocked down
@@ -10911,7 +10911,7 @@
>
#
> I didn’t hear the rest of the name , because I hung up the receiver .
-# ISg/#r+ VXPt VB D NSg/VB P D NSg/VB+ . C/P ISg/#r+ NPr/VB/J NSg/VB/J/P D NSg+ .
+# ISg/#r+ VXPt VB D NSg/VB P D NSg/VB+ . C/P ISg/#r+ NPr/VP/J NSg/VB/J/P D NSg+ .
>
#
> After that I felt a certain shame for Gatsby — one gentleman to whom I telephoned
@@ -11131,7 +11131,7 @@
> It was a photograph of the house , cracked in the corners and dirty with many
# NPr/ISg+ VPt D/P NSg/VB P D+ NPr/VB+ . VP/J NPr/J/R/P D+ NPl/V3+ VB/C VB/J P NSg/I/J/Dq+
> hands . He pointed out every detail to me eagerly . “ Look there ! ” and then sought
-# NPl/V3+ . NPr/ISg+ VP/J NSg/VB/J/R/P Dq+ N🅪Sg/VB/J+ P NPr/ISg+ R . . NSg/VB R . . VB/C NSg/J/R/C VB
+# NPl/V3+ . NPr/ISg+ VP/J NSg/VB/J/R/P Dq+ N🅪Sg/VB/J+ P NPr/ISg+ R . . NSg/VB R . . VB/C NSg/J/R/C VP
> admiration from my eyes . He had shown it so often that I think it was more real
# NSg+ P D$+ NPl/V3+ . NPr/ISg+ VP VPp NPr/ISg+ NSg/I/J/R/C R NSg/I/C/Ddem ISg/#r+ NSg/VB NPr/ISg+ VPt NPr/I/J/R/Dq NSg/J
> to him now than the house itself .