rename

Author: neverRare

dictionary/parser.ts

@@ -26,6 +26,7 @@ import {
 } from "../src/parser/parser_lib.ts";
 import {
   Adjective,
+  AdjectiveName,
   Adverb,
   Definition,
   Determiner,
@@ -34,7 +35,6 @@ import {
   IndirectObject,
   Noun,
   NounForms,
-  PostAdjective,
   VerbAccessory,
 } from "./type.ts";
 
@@ -263,14 +263,14 @@ const noun = sequence(
       simpleUnit("adj"),
       word.skip(tag(sequence(keyword("n"), keyword("proper")))),
     )
-      .map(([adjective, name]): PostAdjective => ({ adjective, name })),
+      .map(([adjective, name]): AdjectiveName => ({ adjective, name })),
   ),
 )
-  .map(([determiners, adjectives, noun, postAdjective]): Noun => ({
+  .map(([determiners, adjectives, noun, adjectiveName]): Noun => ({
     ...noun,
     determiners,
     adjectives,
-    postAdjective,
+    adjectiveName,
   }));
 const checkedNoun = new CheckedParser(
   choiceOnlyOne(

dictionary/type.ts

@@ -2,7 +2,7 @@ export type NounForms = Readonly<{
   singular: null | string;
   plural: null | string;
 }>;
-export type PostAdjective = Readonly<{
+export type AdjectiveName = Readonly<{
   adjective: string;
   name: string;
 }>;
@@ -12,7 +12,7 @@ export type Noun =
     determiners: ReadonlyArray<Determiner>;
     adjectives: ReadonlyArray<Adjective>;
     gerund: boolean;
-    postAdjective: null | PostAdjective;
+    adjectiveName: null | AdjectiveName;
   }>;
 export type PronounForms = Readonly<{
   singular: null | Readonly<{ subject: string; object: string }>;

src/translator/ast.ts

@@ -7,7 +7,7 @@ export type Word = Readonly<{
   emphasis: boolean;
 }>;
 export type Quantity = "singular" | "plural" | "condensed";
-export type PostAdjective = Readonly<{ adjective: string; name: string }>;
+export type AdjectiveName = Readonly<{ adjective: string; name: string }>;
 export type NounPhrase =
   | Readonly<{
     type: "simple";
@@ -16,7 +16,7 @@ export type NounPhrase =
     noun: Word;
     quantity: Quantity;
     perspective: Dictionary.Perspective;
-    postAdjective: null | PostAdjective;
+    adjectiveName: null | AdjectiveName;
     postCompound: null | NounPhrase;
     prepositions: ReadonlyArray<Preposition>;
     emphasis: boolean;

src/translator/clause.ts

@@ -40,7 +40,7 @@ function phraseClause(phrases: TokiPona.MultiplePhrases) {
               },
               quantity: "singular",
               perspective: "third",
-              postAdjective: null,
+              adjectiveName: null,
               postCompound: null,
               prepositions: [],
               emphasis: false,
@@ -102,7 +102,7 @@ function iWish(
       noun: noEmphasis("I"),
       quantity: "singular",
       perspective: "first",
-      postAdjective: null,
+      adjectiveName: null,
       postCompound: null,
       prepositions: [],
       emphasis: false,
@@ -143,7 +143,7 @@ function oClause(clause: TokiPona.Clause & { type: "o clause" }) {
       noun: noEmphasis("you"),
       quantity: "plural",
       perspective: "second",
-      postAdjective: null,
+      adjectiveName: null,
       postCompound: null,
       prepositions: [],
       emphasis: false,

src/translator/composer.ts

@@ -18,7 +18,7 @@ export function noun(phrases: English.NounPhrase, depth: number): string {
         ...phrases.determiners.map(({ determiner }) => word(determiner)),
         ...phrases.adjectives.map(adjective),
         word(phrases.noun),
-        ...nullableAsArray(phrases.postAdjective)
+        ...nullableAsArray(phrases.adjectiveName)
           .map(({ adjective, name }) => `${adjective} ${name}`),
         ...nullableAsArray(phrases.postCompound)
           .map((phrase) => noun(phrase, 0)),

src/translator/fixer.ts

@@ -15,7 +15,7 @@ function rankNoun(noun: English.NounPhrase): number {
 function fixNounPhrase(noun: English.NounPhrase): English.NounPhrase {
   switch (noun.type) {
     case "simple":
-      if (noun.postAdjective != null && noun.prepositions.length > 0) {
+      if (noun.adjectiveName != null && noun.prepositions.length > 0) {
         throw new FilteredError("named noun with preposition");
       }
       if (

src/translator/modifier.ts

@@ -245,7 +245,7 @@ export function multipleModifiers(
             noun: noEmphasis("way"),
             quantity: "singular",
             perspective: "third",
-            postAdjective: null,
+            adjectiveName: null,
             postCompound: null,
             prepositions: [],
             emphasis: false,

src/translator/nanpa.ts

@@ -32,7 +32,7 @@ export function nanpa(
           quantity: "singular",
           perspective: "third",
           postCompound: phrase.noun,
-          postAdjective: null,
+          adjectiveName: null,
           prepositions: [],
           emphasis: false,
         }

src/translator/noun.ts

@@ -19,7 +19,7 @@ export type PartialNoun =
     reduplicationCount: number;
     emphasis: boolean;
     perspective: Dictionary.Perspective;
-    postAdjective: null | { adjective: string; name: string };
+    adjectiveName: null | { adjective: string; name: string };
   }>;
 export function partialNoun(
   options: Readonly<{

src/translator/phrase.ts

@@ -55,13 +55,13 @@ function nounPhrase(
       ...[...modifier.adjectives].reverse(),
       ...noun.adjectives,
     ];
-    if (noun.postAdjective != null && modifier.name != null) {
+    if (noun.adjectiveName != null && modifier.name != null) {
       throw new FilteredError("double name");
     }
-    const postAdjective = noun.postAdjective ??
+    const adjectiveName = noun.adjectiveName ??
       mapNullable(
         modifier.name,
-        (name): English.PostAdjective => ({ adjective: "named", name }),
+        (name): English.AdjectiveName => ({ adjective: "named", name }),
       );
     const prepositions = nullableAsArray(modifier.ofPhrase)
       .map((object) => nounAsPreposition(object, "of"));
@@ -79,7 +79,7 @@ function nounPhrase(
         quantity,
         perspective: noun.perspective,
         postCompound: null,
-        postAdjective,
+        adjectiveName,
         prepositions,
         emphasis: emphasis &&
           nounPreposition == null,

src/translator/pronoun.ts

@@ -38,7 +38,7 @@ export function pronounAsPartialNoun(
     determiners: [],
     adjectives: [],
     perspective: pronoun.perspective,
-    postAdjective: null,
+    adjectiveName: null,
   };
 }
 export function pronoun(
@@ -59,7 +59,7 @@ export function pronoun(
       quantity,
       perspective: definition.perspective,
       postCompound: null,
-      postAdjective: null,
+      adjectiveName: null,
       prepositions: [],
       emphasis: false,
     }));

src/translator/word_unit.ts

@@ -123,7 +123,7 @@ export function wordUnit(
           reduplicationCount: 1,
           emphasis: wordUnit.emphasis != null,
           perspective: "third",
-          postAdjective: null,
+          adjectiveName: null,
         }));
     case "x ala x":
       return IterableResult.errors([new TranslationTodoError("x ala x")]);