more english equative and partial fix naming to pastSubjunctive

This commit is contained in:
lingdocs 2021-10-22 17:02:19 -04:00
parent 80b22d98ad
commit 67172992eb
2 changed files with 10 additions and 4 deletions

View File

@ -152,6 +152,9 @@ export const subjPastEquative: T.ArrayOneOrMore<T.PsString> = aayTail.map((a) =>
export const englishEquative: { export const englishEquative: {
past: T.EnglishBlock, past: T.EnglishBlock,
present: T.EnglishBlock, present: T.EnglishBlock,
future: string,
wouldBe: string,
pastSubjunctive: string,
// present: T.VerbBlock, // present: T.VerbBlock,
// subjunctive: T.VerbBlock, // subjunctive: T.VerbBlock,
// hypothetical: T.VerbBlock, // hypothetical: T.VerbBlock,
@ -172,13 +175,16 @@ export const englishEquative: {
["is", "are"], ["is", "are"],
["is", "are"], ["is", "are"],
], ],
future: "will be",
wouldBe: "would be",
pastSubjunctive: "were",
} }
export const equativeEndings: { export const equativeEndings: {
past: T.LengthOptions<T.VerbBlock>, past: T.LengthOptions<T.VerbBlock>,
present: T.VerbBlock, present: T.VerbBlock,
subjunctive: T.VerbBlock, subjunctive: T.VerbBlock,
hypothetical: T.VerbBlock, pastSubjunctive: T.VerbBlock,
} = { } = {
past: { past: {
short: [ short: [
@ -437,7 +443,7 @@ export const equativeEndings: {
}] }]
], ],
], ],
hypothetical: [ pastSubjunctive: [
[subjPastEquative, subjPastEquative], [subjPastEquative, subjPastEquative],
[subjPastEquative, subjPastEquative], [subjPastEquative, subjPastEquative],
[subjPastEquative, subjPastEquative], [subjPastEquative, subjPastEquative],

View File

@ -401,7 +401,7 @@ function makePerfectContent(info: T.NonComboVerbInfo): T.PerfectContent {
const subjunctive = addToForm([...pastPart, " "], equativeEndings.subjunctive); const subjunctive = addToForm([...pastPart, " "], equativeEndings.subjunctive);
const future = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.subjunctive); const future = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.subjunctive);
const affirmational = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.past.short); const affirmational = addToForm([baParticle, " ", ...pastPart, " "], equativeEndings.past.short);
const pastSubjunctiveHypothetical = addToForm([...pastPart, " "], equativeEndings.hypothetical); const pastSubjunctiveHypothetical = addToForm([...pastPart, " "], equativeEndings.pastSubjunctive);
return { return {
halfPerfect, // Past Participle halfPerfect, // Past Participle
past, // Past Participle + Past Equative past, // Past Participle + Past Equative
@ -497,7 +497,7 @@ function makePassivePerfectContent(info: T.StativeCompoundVerbInfo): T.PerfectCo
); );
const pastSubjunctiveHypothetical = addToForm( const pastSubjunctiveHypothetical = addToForm(
[info.complement, " ", passiveStativeBridge, " ", pPart, " "], [info.complement, " ", passiveStativeBridge, " ", pPart, " "],
equativeEndings.hypothetical, equativeEndings.pastSubjunctive,
); );
return { return {
halfPerfect, halfPerfect,