diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf index e40a64fa3..925f28c20 100644 --- a/src/korean/ResKor.gf +++ b/src/korean/ResKor.gf @@ -316,13 +316,16 @@ oper Sentence : Type = {s : ClType => Str} ; - predVP : NounPhrase -> VerbPhrase -> ClSlash = \np,vp -> vp ** { + predVP : NounPhrase -> VerbPhrase -> ClSlash = \np,vp -> + let npstr : Str = np.s ! vp.sc in predVP' npstr vp ; + + predVP' : (np : Str) -> VerbPhrase -> ClSlash = \np,vp -> vp ** { s = \\t,a,p,cltyp => let vf = case cltyp of { Subord => VAttr p ; WithConj => VStem ; _ => VF Polite p } -- TODO: more tenses, politeness - in np.s ! vp.sc + in np ++ vp.nObj -- an object, not copula complement ++ vp.adv ++ vp.s ! vf diff --git a/src/korean/SentenceKor.gf b/src/korean/SentenceKor.gf index d8bd73727..38d9738e2 100644 --- a/src/korean/SentenceKor.gf +++ b/src/korean/SentenceKor.gf @@ -11,7 +11,7 @@ lin PredVP = predVP ; -- : SC -> VP -> Cl ; -- that she goes is good (Saeed p. 94) - --PredSCVP sc vp = ; + PredSCVP sc vp = predVP' sc.s vp ; --2 Clauses missing object noun phrases -- : NP -> VPSlash -> ClSlash ; @@ -35,16 +35,16 @@ lin ImpVP vp = {s = \\num,pol => linVP (VImp num pol) Statement vp} ; --2 Embedded sentences - +-} -- : S -> SC ; - EmbedS s = {s = s.s ! True} ; -- choose subordinate + EmbedS s = {s = s.s ! Subord ++ "것이"} ; -- TODO check subject case -- : QS -> SC ; -- EmbedQS qs = { } ; -- : VP -> SC ; - EmbedVP vp = {s = infVP vp} ; --} + EmbedVP vp = {s = vp.s ! VAttr Pos ++ "것이"} ; + --2 Sentences -- : Temp -> Pol -> Cl -> S ;