remove quotation

Author: neverRare

src/parser/ast.ts

@@ -22,8 +22,7 @@ export type Modifier =
   | Readonly<{ type: "default"; word: WordUnit }>
   | Readonly<{ type: "proper words"; words: string }>
   | Readonly<{ type: "pi"; phrase: Phrase }>
-  | (Readonly<{ type: "nanpa" }> & Nanpa)
-  | (Readonly<{ type: "quotation" }> & Quotation);
+  | (Readonly<{ type: "nanpa" }> & Nanpa);
 export type Phrase =
   | Readonly<{
     type: "default";
@@ -38,8 +37,7 @@ export type Phrase =
     phrase: Phrase;
     emphasis: null | Emphasis;
   }>
-  | (Readonly<{ type: "preposition" }> & Preposition)
-  | (Readonly<{ type: "quotation" }> & Quotation);
+  | (Readonly<{ type: "preposition" }> & Preposition);
 export type MultiplePhrases =
   | Readonly<{ type: "single"; phrase: Phrase }>
   | Readonly<{
@@ -77,8 +75,9 @@ export type Clause =
     subjects: null | MultiplePhrases;
     predicates: Predicate;
   }>
-  | Readonly<{ type: "prepositions"; prepositions: ReadonlyArray<Preposition> }>
-  | (Readonly<{ type: "quotation" }> & Quotation);
+  | Readonly<
+    { type: "prepositions"; prepositions: ReadonlyArray<Preposition> }
+  >;
 export type ContextClause =
   | Clause
   | (Readonly<{ type: "nanpa" }> & Nanpa);

src/parser/composer.ts

@@ -68,8 +68,6 @@ export function modifier(modifier: Modifier): string {
       return `pi ${phrase(modifier.phrase)}`;
     case "nanpa":
       return nanpa(modifier);
-    case "quotation":
-      return quotation(modifier);
   }
 }
 export function phrase(value: Phrase): string {
@@ -91,8 +89,6 @@ export function phrase(value: Phrase): string {
         .join(" ");
     case "preposition":
       return preposition(value);
-    case "quotation":
-      return quotation(value);
   }
 }
 function particle(type: "and conjunction" | "anu", particle: string): string {
@@ -175,8 +171,6 @@ export function clause(clause: Clause): string {
         .join(" ");
     case "prepositions":
       return clause.prepositions.map(preposition).join(" ");
-    case "quotation":
-      throw new Error();
   }
 }
 export function contextClause(contextClause: ContextClause): string {

src/parser/extract.ts

@@ -25,7 +25,6 @@ export function everyWordUnitInModifier(
       return everyWordUnitInPhrase(modifier.phrase);
     case "nanpa":
       return everyWordUnitInNanpa(modifier);
-    case "quotation":
     case "proper words":
       return [];
   }
@@ -45,8 +44,6 @@ export function everyWordUnitInPhrase(phrase: Phrase): ReadonlyArray<WordUnit> {
       ];
     case "preposition":
       return everyWordUnitInPreposition(phrase);
-    case "quotation":
-      return [];
   }
 }
 export function everyWordUnitInMultiplePhrases(
@@ -99,8 +96,6 @@ export function everyWordUnitInClause(clause: Clause): ReadonlyArray<WordUnit> {
       ];
     case "prepositions":
       return clause.prepositions.flatMap(everyWordUnitInPreposition);
-    case "quotation":
-      return [];
   }
 }
 export function everyWordUnitInContextClause(
@@ -142,8 +137,6 @@ export function everyModifierInPhrase(phrase: Phrase): ReadonlyArray<Modifier> {
         ...phrase.modifiers,
         ...everyModifierInMultiplePhrases(phrase.phrases),
       ];
-    case "quotation":
-      return [];
   }
 }
 export function everyModifierInMultiplePhrases(

src/parser/filter.ts

@@ -42,11 +42,6 @@ export const NANPA_RULES: ReadonlyArray<(nanpa: Nanpa) => boolean> = [
     modifier.phrase.type !== "preverb" ||
     throwError(new UnrecognizedError("preverb inside nanpa")),
 
-  // nanpa construction cannot contain quotation
-  (modifier) =>
-    modifier.phrase.type !== "quotation" ||
-    throwError(new UnrecognizedError("quotation inside nanpa")),
-
   // nanpa construction cannot contain pi
   (modifier) =>
     modifier.phrase.type !== "default" ||
@@ -60,24 +55,9 @@ export const NANPA_RULES: ReadonlyArray<(nanpa: Nanpa) => boolean> = [
     throwError(new UnrecognizedError("nanpa inside nanpa")),
 
   // nanpa cannot have emphasis particle
-  (modifier) => {
-    const { phrase } = modifier;
-    switch (phrase.type) {
-      case "preposition":
-      case "preverb":
-      case "default":
-        return phrase.emphasis == null;
-      case "quotation":
-        return true;
-    }
-  },
+  (modifier) => modifier.phrase.emphasis == null,
 ];
 export const MODIFIER_RULES: ReadonlyArray<(modifier: Modifier) => boolean> = [
-  // quotation modifier cannot exist
-  (modifier) =>
-    modifier.type !== "quotation" ||
-    throwError(new UnrecognizedError("quotation as modifier")),
-
   // pi cannot contain preposition
   (modifier) =>
     modifier.type !== "pi" || modifier.phrase.type !== "preposition" ||
@@ -99,8 +79,6 @@ export const MODIFIER_RULES: ReadonlyArray<(modifier: Modifier) => boolean> = [
   //     switch (modifier.type) {
   //       case "default":
   //       case "proper words":
-  //       case "quotation":
-  //         return false;
   //       case "nanpa":
   //         return everyModifierInPhrase(modifier.phrase).some(checker);
   //       case "pi":
@@ -116,21 +94,7 @@ export const MODIFIER_RULES: ReadonlyArray<(modifier: Modifier) => boolean> = [
   // },
 
   // pi cannot have emphasis particle
-  (modifier) => {
-    if (modifier.type === "pi") {
-      const { phrase } = modifier;
-      switch (phrase.type) {
-        case "default":
-        case "preposition":
-        case "preverb":
-          return phrase.emphasis == null;
-        case "quotation":
-          return true;
-      }
-    } else {
-      return true;
-    }
-  },
+  (modifier) => modifier.type !== "pi" || modifier.phrase.emphasis == null,
 ];
 export const MULTIPLE_MODIFIERS_RULES: ReadonlyArray<
   (modifier: ReadonlyArray<Modifier>) => boolean
@@ -179,7 +143,6 @@ export const MULTIPLE_MODIFIERS_RULES: ReadonlyArray<
             } else {
               return [];
             }
-          case "quotation":
           case "proper words":
           case "nanpa":
             return [];
@@ -195,11 +158,6 @@ export const MULTIPLE_MODIFIERS_RULES: ReadonlyArray<
   },
 ];
 export const PHRASE_RULE: ReadonlyArray<(phrase: Phrase) => boolean> = [
-  // Disallow quotation
-  (phrase) =>
-    phrase.type !== "quotation" ||
-    throwError(new UnrecognizedError("quotation as phrase")),
-
   // Disallow preverb modifiers other than "ala"
   (phrase) =>
     phrase.type !== "preverb" || modifiersIsAlaOrNone(phrase.modifiers) ||
@@ -227,21 +185,14 @@ export const PHRASE_RULE: ReadonlyArray<(phrase: Phrase) => boolean> = [
 
   // Emphasis must not be nested
   (phrase) => {
-    switch (phrase.type) {
-      case "preposition":
-      case "preverb":
-      case "default":
-        if (
-          phrase.emphasis == null ||
-          everyWordUnitInPhrase(phrase)
-            .every((wordUnit) => wordUnit.emphasis == null)
-        ) {
-          return true;
-        } else {
-          throw new UnrecognizedError("nested emphasis");
-        }
-      case "quotation":
-        return true;
+    if (
+      phrase.emphasis == null ||
+      everyWordUnitInPhrase(phrase)
+        .every((wordUnit) => wordUnit.emphasis == null)
+    ) {
+      return true;
+    } else {
+      throw new UnrecognizedError("nested emphasis");
     }
   },
 ];
@@ -294,7 +245,6 @@ export const CLAUSE_RULE: ReadonlyArray<(clause: Clause) => boolean> = [
         }
         break;
       case "prepositions":
-      case "quotation":
         return true;
     }
     if (
@@ -458,8 +408,6 @@ function hasPrepositionInPhrase(phrase: Phrase): boolean {
       return true;
     case "preverb":
       return hasPrepositionInPhrase(phrase.phrase);
-    case "quotation":
-      return false;
   }
 }
 function phraseHasTopLevelEmphasis(phrase: Phrase): boolean {
@@ -468,7 +416,5 @@ function phraseHasTopLevelEmphasis(phrase: Phrase): boolean {
     case "preverb":
     case "preposition":
       return phrase.emphasis != null;
-    case "quotation":
-      return false;
   }
 }

src/parser/parser.ts

@@ -574,9 +574,7 @@ const clause = choice<Clause>(
       prepositions,
     })),
   subjectPhrases
-    .filter((phrases) =>
-      phrases.type !== "single" || phrases.phrase.type !== "quotation"
-    )
+    .filter((phrases) => phrases.type !== "single")
     .map((phrases) => ({ type: "phrases", phrases })),
   subjectPhrases
     .skip(specificWord("o"))

src/translator/clause.ts

@@ -119,7 +119,6 @@ export function clause(clause: TokiPona.Clause): ArrayResult<English.Clause> {
       return liClause(clause);
     case "prepositions":
     case "o clause":
-    case "quotation":
       return new ArrayResult(new TranslationTodoError(clause.type));
   }
 }

src/translator/modifier.ts

@@ -217,8 +217,6 @@ function modifier(
       return piModifier(modifier.phrase);
     case "nanpa":
       return nanpaModifier(modifier);
-    case "quotation":
-      return new ArrayResult(new TranslationTodoError(modifier.type));
   }
 }
 export function multipleModifiers(

src/translator/phrase.ts

@@ -219,7 +219,6 @@ export function phrase(
       return defaultPhrase({ ...options, phrase });
     case "preverb":
     case "preposition":
-    case "quotation":
       return new ArrayResult(new TranslationTodoError(phrase.type));
   }
 }