update todos and rename

Author: neverRare

src/resolver_and_composer/ast.ts

@@ -26,10 +26,10 @@ export type NounPhrase =
   }>;
 export type Determiner = Readonly<{
   determiner: Word;
+  quantity: Dictionary.Quantity;
 
-  // TODO: remove these two
+  // TODO: remove this
   kind: Dictionary.DeterminerType;
-  quantity: Dictionary.Quantity;
 }>;
 export type AdjectivePhrase =
   | Readonly<{
@@ -52,21 +52,22 @@ export type Complement =
   | Readonly<{ type: "adjective"; adjective: AdjectivePhrase }>;
 export type Adverb = Readonly<{
   adverb: Word;
+  // TODO: remove this
   negative: boolean;
 }>;
-export type Verb = {
+export type VerbAdverb = {
   preAdverbs: ReadonlyArray<Adverb>;
   verb: Word;
   postAdverb: null | Adverb;
 };
-export type WholeVerb = Readonly<{
-  modal: null | Verb;
-  verbs: ReadonlyArray<Verb>;
+export type Verb = Readonly<{
+  modal: null | VerbAdverb;
+  verbs: ReadonlyArray<VerbAdverb>;
 }>;
 export type VerbPhrase =
   | Readonly<{
     type: "simple";
-    verb: WholeVerb;
+    verb: Verb;
     subjectComplement: null | Complement;
     contentClause: null | Clause;
     object: null | NounPhrase;

src/resolver_and_composer/composer.ts

@@ -71,7 +71,7 @@ function complement(complement: English.Complement) {
       return adjective(complement.adjective, 0);
   }
 }
-function singeVerb(verbAdverb: English.Verb) {
+function singeVerb(verbAdverb: English.VerbAdverb) {
   const { preAdverbs, verb, postAdverb } = verbAdverb;
   const verbPost = verb.word === "can" && postAdverb != null &&
       postAdverb.adverb.word === "not"

src/translator_legacy/fixer.ts

@@ -180,13 +180,13 @@ function fixComplement(complement: English.Complement): English.Complement {
       };
   }
 }
-function fixSingleVerb(adverbVerb: English.Verb): English.Verb {
+function fixSingleVerb(adverbVerb: English.VerbAdverb): English.VerbAdverb {
   return {
     ...adverbVerb,
     preAdverbs: fixMultipleAdverbs(adverbVerb.preAdverbs),
   };
 }
-function fixVerb(verb: English.WholeVerb): English.WholeVerb {
+function fixVerb(verb: English.Verb): English.Verb {
   return {
     modal: mapNullable(verb.modal, fixSingleVerb),
     verbs: verb.verbs.map(fixSingleVerb),

src/translator_legacy/phrase.ts

@@ -310,7 +310,7 @@ function preverb(
         predicate.verb.type === "simple"
       ) {
         const first = predicate.verb.first;
-        let predicateVerb: English.Verb;
+        let predicateVerb: English.VerbAdverb;
         switch (first.type) {
           case "modal":
             return null;

src/translator_legacy/verb.ts

@@ -24,13 +24,13 @@ export type VerbAccessory = Readonly<{
   prepositions: ReadonlyArray<English.Preposition>;
 }>;
 export type FirstVerb =
-  | (Readonly<{ type: "modal" }> & English.Verb)
+  | (Readonly<{ type: "modal" }> & English.VerbAdverb)
   | (Readonly<{ type: "non-modal" }> & VerbFormsWithAccessory);
 export type PartialSimpleVerb =
   & VerbAccessory
   & Readonly<{
     first: FirstVerb;
-    rest: ReadonlyArray<English.Verb>;
+    rest: ReadonlyArray<English.VerbAdverb>;
     subjectComplement: null | English.Complement;
     forObject: boolean | string;
     predicateType: null | "verb" | "noun adjective";
@@ -65,7 +65,7 @@ function addModal(
       throw new FilteredError("nested modal verb");
     case "non-modal": {
       const newRest = nullableAsArray(first)
-        .map((first): English.Verb => {
+        .map((first): English.VerbAdverb => {
           const { adverbs, presentPlural, negated } = first;
           const useVerb = presentPlural === "are" ? "be" : presentPlural;
           const preAdverbs = takeNegative ? adverbs : [
@@ -189,7 +189,7 @@ function fromVerbForms(
   verbForms: VerbFormsWithAccessory,
   perspective: Dictionary.Perspective,
   quantity: English.Quantity,
-): IterableResult<English.WholeVerb> {
+): IterableResult<English.Verb> {
   const { negated, adverbs } = verbForms;
   const is = verbForms.presentSingular === "is";
   const presentSingular = is && perspective === "first"
@@ -203,8 +203,8 @@ function fromVerbForms(
       ? [pastPlural, verbForms.presentPlural, "do"]
       : [pastSingular, presentSingular, "does"];
   type Result = Readonly<{
-    modal: null | English.Verb;
-    doesNot: null | English.Verb;
+    modal: null | English.VerbAdverb;
+    doesNot: null | English.VerbAdverb;
     verb: string;
     postAdverb: null | English.Adverb;
   }>;
@@ -346,7 +346,7 @@ function fromVerbForms(
   }
   return result.map((
     { modal, doesNot, verb, postAdverb },
-  ): English.WholeVerb => ({
+  ): English.Verb => ({
     modal,
     verbs: [
       ...nullableAsArray(doesNot),
@@ -401,6 +401,6 @@ export function verb(
     }
   }
 }
-export function noAdverbs(verb: English.Word): English.Verb {
+export function noAdverbs(verb: English.Word): English.VerbAdverb {
   return { preAdverbs: [], verb, postAdverb: null };
 }