diff --git a/src/korean/ParadigmsKor.gf b/src/korean/ParadigmsKor.gf index e2e2872ce..575e50df4 100644 --- a/src/korean/ParadigmsKor.gf +++ b/src/korean/ParadigmsKor.gf @@ -29,13 +29,14 @@ oper -- Verbs mkV : overload { mkV : (plain : Str) -> V ; -- Predictable verb: plaininitive form as argument --- mkV : Str -> V -> V -- Add a prefix to an existing verb, e.g. u baahan+ahay +-- mkV : Str -> V -> V -- Add a prefix to an existing verb } ; copula : V ; -- The copula verb '' mkV2 : overload { - mkV2 : (plain : Str) -> V2 ; + mkV2 : (plain : Str) -> V2 ; -- Regular verb. Takes -다 form, object particle is 를. + mkV2 : V -> V2 ; -- Takes pre-constructed V, object particle is 를. } ; -- mkV3 : overload { @@ -112,6 +113,7 @@ oper mkV2 = overload { mkV2 : (plain : Str) -> V2 = \v2 -> lin V2 (mkVerb2 v2) ; + mkV2 : V -> V2 = vtov2 ; } ; mkV3 = overload { diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index 00be5f0ec..d2f743fcd 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -99,7 +99,8 @@ oper mkPrep : Str -> Postposition = \str -> ss str ; - emptyPP = mkPrep [] ; + emptyPP : Postposition = mkPrep [] ; + datPP : Postposition = mkPrep "에게" ; -------------------------------------------------------------------------------- -- Adjectives @@ -148,13 +149,11 @@ oper plain plain plain vt ; -- TODO proper forms - mkVerb2 : (plain : Str) -> Verb2 = \plain -> - let v = mkVerb plain Active - in v ** {c2 = Object ; p2 = emptyPP} ; + mkVerb2 : (plain : Str) -> Verb2 = \plain -> vtov2 (mkVerb plain Active) ; + mkVerb3 : (plain : Str) -> Verb3 = \plain -> v2tov3 (mkVerb2 plain) ; - mkVerb3 : (plain : Str) -> Verb3 = \plain -> - let v = mkVerb2 plain - in v ** {c3 = Bare ; p3 = emptyPP} ; + vtov2 : Verb -> Verb2 = \v -> v ** {c2 = Object ; p2 = emptyPP} ; + v2tov3 : Verb2 -> Verb3 = \v -> v ** {c3 = Bare ; p3 = datPP} ; mkVerbFull : (x1,_,_,_,_,x6 : Str) -> VerbType -> Verb = \plain,polite,formal,planeg,polneg,formneg,vt -> {