From 85babd3730b3c6767ebe74dc99a9626cc2d436a1 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 26 Mar 2020 16:06:03 +0100 Subject: [PATCH] (Kor) Minor fixes and cleanup --- src/korean/CatKor.gf | 2 +- src/korean/Hangul.gf | 6 ++---- src/korean/NounKor.gf | 2 +- src/korean/NumeralKor.gf | 2 +- src/korean/ResKor.gf | 4 +--- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/korean/CatKor.gf b/src/korean/CatKor.gf index 4f5608bb..f6d3f5c6 100644 --- a/src/korean/CatKor.gf +++ b/src/korean/CatKor.gf @@ -66,7 +66,7 @@ concrete CatKor of Cat = CommonX ** open ResKor, Prelude in { Quant = ResKor.Quant ; Num = ResKor.Num ; Ord = { - s : Str ; -- AForm => Str ; -- Ord can came from AP and become AP again + s : Str ; -- AForm => Str ; -- Ord can come from AP and become AP again n : Number -- Ord can come from Num, which has inherent number } ; DAP = ResKor.Determiner ; diff --git a/src/korean/Hangul.gf b/src/korean/Hangul.gf index 73d8333f..11264927 100644 --- a/src/korean/Hangul.gf +++ b/src/korean/Hangul.gf @@ -21,7 +21,7 @@ oper addSuffix : Str -> Str = \stem -> case stem of { -- Final ㅏ or ㅓ does not repeat itself. - _ + #a|#eo -- TODO if it's one syllable long and ends in #a, which rule applies? + _ + #a|#eo => stem ; -- Assimilations with ㅣ, ㅗ, ㅜ @@ -32,11 +32,9 @@ oper start + ult@#u => start + u_to_weo ult ; - -- Special case: monosyllabic stem + -- Special case: monosyllabic stem ending in 으 -- 으 is dropped, replace the old vowel. #eu => eu_to_eo stem ; - -- Otherwise add 어. - x@? => stem + "어" ; -- Easy regular cases to finish with. _ + #a_o => stem + "아" ; diff --git a/src/korean/NounKor.gf b/src/korean/NounKor.gf index 7f8798ae..d2a3860c 100644 --- a/src/korean/NounKor.gf +++ b/src/korean/NounKor.gf @@ -10,7 +10,7 @@ concrete NounKor of Noun = CatKor ** open ResKor, Prelude in { DetCN det cn = cn ** {s = \\c => let cns : Str = case det.n of { - -- Pl => n.s ! Bare ++ BIND ++ plural ! c ; + -- Pl => cn.s ! Bare ++ BIND ++ plural ! c ; _Sg => cn.s ! c } ; dets : Str = det.s ! cn.c.origin ; detnum : Str = case det.numtype of { diff --git a/src/korean/NumeralKor.gf b/src/korean/NumeralKor.gf index 9b2c6edb..31be00cc 100644 --- a/src/korean/NumeralKor.gf +++ b/src/korean/NumeralKor.gf @@ -23,7 +23,7 @@ lin n9 = mkNum2 "구" "아홉" ; -- : Sub10 ; -- 1 - pot01 = mkNum4 "일" "하나" "한" "첫" ; + pot01 = mkNum5 "일" "하나" "한" "첫" "열" ; -- : Digit -> Sub10 ; -- d * 1 pot0 x = x ; diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index 84fcc2eb..e6fa8aa2 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -164,9 +164,7 @@ oper plainpres = case vowFinal stem of { True => add_N stem + "다" ; False => stem + "는다" } ; - informal = case vowFinal stem of { -- not used in grammar yet - True => add_eo stem ; - False => stem + "어" } ; + informal = add_eo stem ; -- not used in grammar yet polpres = informal + "요" ; formalpres = case vowFinal stem of { True => add_B stem + "니다" ;