From 67172992ebb4f59eda8957224c08c192ed1da7d5 Mon Sep 17 00:00:00 2001 From: lingdocs <71590811+lingdocs@users.noreply.github.com> Date: Fri, 22 Oct 2021 17:02:19 -0400 Subject: [PATCH] more english equative and partial fix naming to pastSubjunctive --- src/lib/grammar-units.ts | 10 ++++++++-- src/lib/verb-conjugation.ts | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/grammar-units.ts b/src/lib/grammar-units.ts index 5ef86db..f1bf6e0 100644 --- a/src/lib/grammar-units.ts +++ b/src/lib/grammar-units.ts @@ -152,6 +152,9 @@ export const subjPastEquative: T.ArrayOneOrMore = aayTail.map((a) => export const englishEquative: { past: T.EnglishBlock, present: T.EnglishBlock, + future: string, + wouldBe: string, + pastSubjunctive: string, // present: T.VerbBlock, // subjunctive: T.VerbBlock, // hypothetical: T.VerbBlock, @@ -172,13 +175,16 @@ export const englishEquative: { ["is", "are"], ["is", "are"], ], + future: "will be", + wouldBe: "would be", + pastSubjunctive: "were", } export const equativeEndings: { past: T.LengthOptions, present: T.VerbBlock, subjunctive: T.VerbBlock, - hypothetical: T.VerbBlock, + pastSubjunctive: T.VerbBlock, } = { past: { short: [ @@ -437,7 +443,7 @@ export const equativeEndings: { }] ], ], - hypothetical: [ + pastSubjunctive: [ [subjPastEquative, subjPastEquative], [subjPastEquative, subjPastEquative], [subjPastEquative, subjPastEquative], diff --git a/src/lib/verb-conjugation.ts b/src/lib/verb-conjugation.ts index 4cb269d..06d51a5 100644 --- a/src/lib/verb-conjugation.ts +++ b/src/lib/verb-conjugation.ts @@ -401,7 +401,7 @@ function makePerfectContent(info: T.NonComboVerbInfo): T.PerfectContent { const subjunctive = addToForm([...pastPart, " "], equativeEndings.subjunctive); const future = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.subjunctive); const affirmational = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.past.short); - const pastSubjunctiveHypothetical = addToForm([...pastPart, " "], equativeEndings.hypothetical); + const pastSubjunctiveHypothetical = addToForm([...pastPart, " "], equativeEndings.pastSubjunctive); return { halfPerfect, // Past Participle past, // Past Participle + Past Equative @@ -497,7 +497,7 @@ function makePassivePerfectContent(info: T.StativeCompoundVerbInfo): T.PerfectCo ); const pastSubjunctiveHypothetical = addToForm( [info.complement, " ", passiveStativeBridge, " ", pPart, " "], - equativeEndings.hypothetical, + equativeEndings.pastSubjunctive, ); return { halfPerfect,