diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index 7f8f21cd..10621b4a 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -231,19 +231,25 @@ oper } ; VerbPhrase : Type = BaseVerb ** Complement ** { + nObj, vComp : Str -- {subjunc : Str ; -- inflected verb complement -- inf : Str ; -- infinitive verb complement -- subcl : Str} -- clause complement } ; - VPSlash : Type = VerbPhrase ; + VPSlash : Type = Verb2 ; useV : Verb -> VerbPhrase = \v -> v ** { - vComp, - nComp = [] ; + nObj, + vComp = [] ; } ; + useVc : Verb2 -> VPSlash = \v2 -> v2 ; + + insertComp : VPSlash -> NounPhrase -> VerbPhrase = \v2,np -> useV v2 ** { + nObj = np.s ! v2.c2 ++ v2.p2.s + } ; -------------------------------------------------------------------------------- -- Cl, S @@ -264,7 +270,8 @@ oper predVP : NounPhrase -> VerbPhrase -> ClSlash = \np,vp -> vp ** { s = \\t,a,p => np.s ! vp.sc - ++ vp.s ! VF Polite p -- TODO: more tenses + ++ vp.nObj -- an object, not copula complement + ++ vp.s ! VF Polite p -- TODO: more tenses, choose politeness } ; -------------------------------------------------------------------------------- diff --git a/src/korean/VerbKor.gf b/src/korean/VerbKor.gf index 4963e886..3a00a69c 100644 --- a/src/korean/VerbKor.gf +++ b/src/korean/VerbKor.gf @@ -35,9 +35,10 @@ lin -} -------- -- Slash -{- -- : V2 -> VPSlash - SlashV2a = useVc ; + SlashV2a = ResKor.useVc ; + +{- -- : V3 -> NP -> VPSlash ; -- give it (to her) -- : V3 -> NP -> VPSlash ; -- give (it) to her @@ -61,10 +62,10 @@ lin SlashV2A v2a ap = useVc v2a ** { aComp = \\_ => (CompAP ap).aComp ! Sg3 Masc } ; - - -- : VPSlash -> NP -> VP - ComplSlash = insertComp ; -} + -- : VPSlash -> NP -> VP + ComplSlash = ResKor.insertComp ; + {- -- : VV -> VPSlash -> VPSlash ; -- Just like ComplVV except missing subject!