Skip to content

Commit 77a4aed

Browse files
neverRareneverRare
committed
rename
1 parent 690816c commit 77a4aed

15 files changed

+76
-76
lines changed

‎src/parser/ast.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export type Filler =
55
| Emphasis
66
| Readonly<{ type: "multiple a"; count: number }>;
77
export type SimpleHeadedWordUnit =
8-
| Readonly<{ type: "default"; word: string }>
8+
| Readonly<{ type: "simple"; word: string }>
99
| Readonly<{ type: "x ala x"; word: string }>
1010
| Readonly<{ type: "reduplication"; word: string; count: number }>;
1111
export type SimpleWordUnit =
@@ -19,13 +19,13 @@ export type WordUnit =
1919
& Readonly<{ emphasis: null | Emphasis }>;
2020
export type Nanpa = Readonly<{ nanpa: WordUnit; phrase: Phrase }>;
2121
export type Modifier =
22-
| Readonly<{ type: "default"; word: WordUnit }>
22+
| Readonly<{ type: "simple"; word: WordUnit }>
2323
| Readonly<{ type: "proper words"; words: string }>
2424
| Readonly<{ type: "pi"; phrase: Phrase }>
2525
| (Readonly<{ type: "nanpa" }> & Nanpa);
2626
export type Phrase =
2727
| Readonly<{
28-
type: "default";
28+
type: "simple";
2929
headWord: WordUnit;
3030
modifiers: ReadonlyArray<Modifier>;
3131
emphasis: null | Emphasis;
@@ -84,7 +84,7 @@ export type ContextClause =
8484
| (Readonly<{ type: "anu"; anu: HeadedWordUnit }>);
8585
export type Sentence =
8686
| Readonly<{
87-
type: "default";
87+
type: "simple";
8888
startingParticle: null | HeadedWordUnit;
8989
contextClauses: ReadonlyArray<ContextClause>;
9090
finalClause: Clause;

‎src/parser/composer.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function simpleWordUnit(wordUnit: SimpleWordUnit): string {
3939
switch (wordUnit.type) {
4040
case "number":
4141
return wordUnit.words.join(" ");
42-
case "default":
42+
case "simple":
4343
return wordUnit.word;
4444
case "x ala x":
4545
return `${wordUnit.word} ala ${wordUnit.word}`;
@@ -59,7 +59,7 @@ export function nanpa(nanpa: Nanpa): string {
5959
}
6060
export function modifier(modifier: Modifier): string {
6161
switch (modifier.type) {
62-
case "default":
62+
case "simple":
6363
return wordUnit(modifier.word);
6464
case "proper words":
6565
return modifier.words;
@@ -71,7 +71,7 @@ export function modifier(modifier: Modifier): string {
7171
}
7272
export function phrase(value: Phrase): string {
7373
switch (value.type) {
74-
case "default":
74+
case "simple":
7575
return [
7676
wordUnit(value.headWord),
7777
...value.modifiers.map(modifier),
@@ -185,7 +185,7 @@ export function contextClause(contextClause: ContextClause): string {
185185
export function sentence(sentence: Sentence): string {
186186
let text: string;
187187
switch (sentence.type) {
188-
case "default":
188+
case "simple":
189189
text = [
190190
...nullableAsArray(sentence.startingParticle).map(wordUnit),
191191
...sentence.contextClauses

‎src/parser/extract.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function everyWordUnitInModifier(
1919
modifier: Modifier,
2020
): ReadonlyArray<WordUnit> {
2121
switch (modifier.type) {
22-
case "default":
22+
case "simple":
2323
return [modifier.word];
2424
case "pi":
2525
return everyWordUnitInPhrase(modifier.phrase);
@@ -31,7 +31,7 @@ export function everyWordUnitInModifier(
3131
}
3232
export function everyWordUnitInPhrase(phrase: Phrase): ReadonlyArray<WordUnit> {
3333
switch (phrase.type) {
34-
case "default":
34+
case "simple":
3535
return [
3636
phrase.headWord,
3737
...phrase.modifiers.flatMap(everyWordUnitInModifier),
@@ -114,7 +114,7 @@ export function everyWordUnitInSentence(
114114
sentence: Sentence,
115115
): ReadonlyArray<WordUnit> {
116116
switch (sentence.type) {
117-
case "default":
117+
case "simple":
118118
return [
119119
...nullableAsArray(sentence.startingParticle),
120120
...sentence.contextClauses.flatMap(everyWordUnitInContextClause),
@@ -127,7 +127,7 @@ export function everyWordUnitInSentence(
127127
}
128128
export function everyModifierInPhrase(phrase: Phrase): ReadonlyArray<Modifier> {
129129
switch (phrase.type) {
130-
case "default":
130+
case "simple":
131131
return phrase.modifiers;
132132
case "preverb":
133133
return [

‎src/parser/filter.ts

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@ export const NANPA_RULES: ReadonlyArray<(nanpa: Nanpa) => boolean> = [
4545

4646
// nanpa construction cannot contain pi
4747
({ phrase }) =>
48-
phrase.type !== "default" ||
48+
phrase.type !== "simple" ||
4949
phrase.modifiers.every(({ type }) => type !== "pi") ||
5050
throwError(new UnrecognizedError("pi inside nanpa")),
5151

5252
// nanpa construction cannot contain nanpa
5353
({ phrase }) =>
54-
phrase.type !== "default" ||
54+
phrase.type !== "simple" ||
5555
phrase.modifiers.every(({ type }) => type !== "nanpa") ||
5656
throwError(new UnrecognizedError("nanpa inside nanpa")),
5757

@@ -68,7 +68,7 @@ export const MODIFIER_RULES: ReadonlyArray<(modifier: Modifier) => boolean> = [
6868
(modifier) => {
6969
if (modifier.type === "pi") {
7070
const { phrase } = modifier;
71-
if (phrase.type === "default" && phrase.modifiers.length === 0) {
71+
if (phrase.type === "simple" && phrase.modifiers.length === 0) {
7272
throw new UnrecognizedError("pi followed by one word");
7373
}
7474
}
@@ -78,7 +78,7 @@ export const MODIFIER_RULES: ReadonlyArray<(modifier: Modifier) => boolean> = [
7878
// (modifier) => {
7979
// const checker = (modifier: Modifier) => {
8080
// switch (modifier.type) {
81-
// case "default":
81+
// case "simple":
8282
// case "proper words":
8383
// case "nanpa":
8484
// return everyModifierInPhrase(modifier.phrase).some(checker);
@@ -129,15 +129,15 @@ export const MULTIPLE_MODIFIERS_RULES: ReadonlyArray<
129129
} else {
130130
const words = modifiers.flatMap((modifier) => {
131131
switch (modifier.type) {
132-
case "default":
132+
case "simple":
133133
if (modifier.word.type !== "number") {
134134
return [modifier.word.word];
135135
} else {
136136
return [];
137137
}
138138
case "pi":
139139
if (
140-
modifier.phrase.type === "default" &&
140+
modifier.phrase.type === "simple" &&
141141
modifier.phrase.headWord.type !== "number"
142142
) {
143143
return [modifier.phrase.headWord.word];
@@ -176,14 +176,14 @@ export const PHRASE_RULE: ReadonlyArray<(phrase: Phrase) => boolean> = [
176176

177177
// disallow multiple number words
178178
(phrase) =>
179-
phrase.type !== "default" ||
179+
phrase.type !== "simple" ||
180180
phrase.headWord.type !== "number" ||
181181
!phrase.modifiers.some(modifierIsNumeric) ||
182182
throwError(new UnrecognizedError("multiple number words")),
183183

184184
// if the phrase has no modifiers, disallow emphasis particle
185185
(phrase) =>
186-
phrase.type !== "default" ||
186+
phrase.type !== "simple" ||
187187
phrase.emphasis == null ||
188188
phrase.modifiers.length > 0,
189189

@@ -293,8 +293,8 @@ export const CLAUSE_RULE: ReadonlyArray<(clause: Clause) => boolean> = [
293293
) {
294294
const { subjects: { phrase } } = clause;
295295
if (
296-
phrase.type === "default" &&
297-
phrase.headWord.type === "default" &&
296+
phrase.type === "simple" &&
297+
phrase.headWord.type === "simple" &&
298298
phrase.headWord.emphasis == null &&
299299
phrase.modifiers.length === 0 &&
300300
phrase.emphasis == null
@@ -311,7 +311,7 @@ export const CLAUSE_RULE: ReadonlyArray<(clause: Clause) => boolean> = [
311311
export const SENTENCE_RULE: ReadonlyArray<(sentence: Sentence) => boolean> = [
312312
// disallow "taso ala taso" or "kin ala kin"
313313
(sentence) => {
314-
if (sentence.type === "default") {
314+
if (sentence.type === "simple") {
315315
if (
316316
sentence.startingParticle != null &&
317317
sentence.startingParticle.type === "x ala x"
@@ -324,7 +324,7 @@ export const SENTENCE_RULE: ReadonlyArray<(sentence: Sentence) => boolean> = [
324324
},
325325
// if there is "la", there can't be starting particle e.g. taso
326326
(sentence) =>
327-
sentence.type !== "default" || sentence.contextClauses.length === 0 ||
327+
sentence.type !== "simple" || sentence.contextClauses.length === 0 ||
328328
sentence.startingParticle == null || throwError(
329329
new UnrecognizedError(
330330
`${sentence.startingParticle.word} particle with "la"`,
@@ -341,7 +341,7 @@ export const SENTENCE_RULE: ReadonlyArray<(sentence: Sentence) => boolean> = [
341341
return false;
342342
case "x ala x":
343343
return true;
344-
case "default":
344+
case "simple":
345345
case "reduplication":
346346
return wordUnit.word === "seme";
347347
}
@@ -393,15 +393,15 @@ export function filter<const T>(
393393
};
394394
}
395395
function modifierIsNumeric(modifier: Modifier) {
396-
return modifier.type === "default" && modifier.word.type === "number";
396+
return modifier.type === "simple" && modifier.word.type === "number";
397397
}
398398
function modifiersIsAlaOrNone(modifiers: ReadonlyArray<Modifier>) {
399399
switch (modifiers.length) {
400400
case 0:
401401
return true;
402402
case 1: {
403403
const [modifier] = modifiers;
404-
return modifier.type === "default" && modifier.word.type === "default" &&
404+
return modifier.type === "simple" && modifier.word.type === "simple" &&
405405
modifier.word.word === "ala";
406406
}
407407
default:
@@ -410,7 +410,7 @@ function modifiersIsAlaOrNone(modifiers: ReadonlyArray<Modifier>) {
410410
}
411411
function hasPrepositionInPhrase(phrase: Phrase) {
412412
switch (phrase.type) {
413-
case "default":
413+
case "simple":
414414
return false;
415415
case "preposition":
416416
return true;
@@ -420,7 +420,7 @@ function hasPrepositionInPhrase(phrase: Phrase) {
420420
}
421421
function phraseHasTopLevelEmphasis(phrase: Phrase) {
422422
switch (phrase.type) {
423-
case "default":
423+
case "simple":
424424
case "preverb":
425425
case "preposition":
426426
return phrase.emphasis != null;

‎src/parser/parser.ts

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ function simpleWordUnit(word: Set<string>, description: string) {
163163
.then(reduplicateRest),
164164
xAlaX(word, description),
165165
wordFrom(word, description)
166-
.map((word) => ({ type: "default", word })),
166+
.map((word) => ({ type: "simple", word })),
167167
);
168168
}
169169
function wordUnit(word: Set<string>, description: string) {
@@ -196,10 +196,10 @@ function optionalCombined(word: Set<string>, description: string) {
196196
.map((wordUnit) => [wordUnit, null]),
197197
binaryWords(word, description)
198198
.map(([first, second]) => [
199-
{ type: "default", word: first, emphasis: null },
199+
{ type: "simple", word: first, emphasis: null },
200200
{
201-
type: "default",
202-
word: { type: "default", word: second, emphasis: null },
201+
type: "simple",
202+
word: { type: "simple", word: second, emphasis: null },
203203
},
204204
]),
205205
);
@@ -214,18 +214,18 @@ const phrase: Parser<Phrase> = lazy(lazyEval(() =>
214214
optionalEmphasis,
215215
)
216216
.map(([words, wordModifier, modifiers, phraseModifier]) => ({
217-
type: "default",
217+
type: "simple",
218218
headWord: { type: "number", words, emphasis: wordModifier },
219219
modifiers,
220220
emphasis: phraseModifier,
221221
})),
222222
binaryWords(preverbSet, "preverb").map(([preverb, phrase]) => ({
223223
type: "preverb",
224-
preverb: { type: "default", word: preverb, emphasis: null },
224+
preverb: { type: "simple", word: preverb, emphasis: null },
225225
modifiers: [],
226226
phrase: {
227-
type: "default",
228-
headWord: { type: "default", word: phrase, emphasis: null },
227+
type: "simple",
228+
headWord: { type: "simple", word: phrase, emphasis: null },
229229
modifiers: [],
230230
emphasis: null,
231231
},
@@ -252,7 +252,7 @@ const phrase: Parser<Phrase> = lazy(lazyEval(() =>
252252
optionalEmphasis,
253253
)
254254
.map(([[headWord, modifier], modifiers, emphasis]) => ({
255-
type: "default",
255+
type: "simple",
256256
headWord,
257257
modifiers: [...nullableAsArray(modifier), ...modifiers],
258258
emphasis,
@@ -275,12 +275,12 @@ const modifiers = sequence(
275275
choice<Modifier>(
276276
sequence(number, optionalEmphasis)
277277
.map(([words, emphasis]) => ({
278-
type: "default",
278+
type: "simple",
279279
word: { type: "number", words, emphasis },
280280
}))
281281
.filter(filter(MODIFIER_RULES)),
282282
wordUnit(contentWordSet, "modifier")
283-
.map((word) => ({ type: "default", word }))
283+
.map((word) => ({ type: "simple", word }))
284284
.filter(filter(MODIFIER_RULES)),
285285
properWords
286286
.map((words) => ({ type: "proper words", words }))
@@ -368,7 +368,7 @@ const preposition = choice(
368368
.skip(specificToken("headless long glyph end"))
369369
.map((phrase) => ({
370370
preposition: {
371-
type: "default",
371+
type: "simple",
372372
word: "lon",
373373
emphasis: null,
374374
},
@@ -400,31 +400,31 @@ const preposition = choice(
400400
.slice(1)
401401
.map((word) =>
402402
({
403-
type: "default",
404-
word: { type: "default", word, emphasis: null },
403+
type: "simple",
404+
word: { type: "simple", word, emphasis: null },
405405
emphasis: null,
406406
}) as const
407407
);
408408
return {
409-
preposition: { type: "default", word: words[0], emphasis: null },
409+
preposition: { type: "simple", word: words[0], emphasis: null },
410410
modifiers,
411411
phrases: { type: "single", phrase, emphasis: null },
412412
emphasis: null,
413413
};
414414
}),
415415
binaryWords(prepositionSet, "preposition").map(([preposition, phrase]) => ({
416416
preposition: {
417-
type: "default",
417+
type: "simple",
418418
word: preposition,
419419
emphasis: null,
420420
},
421421
modifiers: [],
422422
phrases: {
423423
type: "single",
424424
phrase: {
425-
type: "default",
425+
type: "simple",
426426
headWord: {
427-
type: "default",
427+
type: "simple",
428428
word: phrase,
429429
emphasis: null,
430430
},
@@ -528,9 +528,9 @@ const clause = choice<Clause>(
528528
subjects: {
529529
type: "single",
530530
phrase: {
531-
type: "default",
531+
type: "simple",
532532
headWord: {
533-
type: "default",
533+
type: "simple",
534534
word: subject,
535535
emphasis: null,
536536
},
@@ -658,7 +658,7 @@ const sentence = choice<Sentence>(
658658
punctuation,
659659
]) => {
660660
const sentence = {
661-
type: "default",
661+
type: "simple",
662662
startingParticle,
663663
contextClauses,
664664
finalClause,
@@ -671,7 +671,7 @@ const sentence = choice<Sentence>(
671671
const interrogative = wordUnits.some(({ type }) => type === "x ala x")
672672
? "x ala x"
673673
: wordUnits.some((wordUnit) =>
674-
(wordUnit.type === "default" ||
674+
(wordUnit.type === "simple" ||
675675
wordUnit.type === "reduplication") &&
676676
wordUnit.word === "seme"
677677
)

0 commit comments

Comments
 (0)