diff --git a/src/malay/ExtendMay.gf b/src/malay/ExtendMay.gf index f26063b6..d72a25ce 100644 --- a/src/malay/ExtendMay.gf +++ b/src/malay/ExtendMay.gf @@ -105,13 +105,17 @@ concrete ExtendMay of Extend = CatMay -- PassVPSlash : VPS -> VP ; -- be begged to sleep PassVPSlash vps = vps ** { - s = \\vf,pol => vps.s ! Passive ! pol ; + s = \\vf,pol => vps.s ! Passive ! pol ++ vps.adjCompl; }; -- PassAgentVPSlash : VPSlash -> NP -> VP ; -- be begged by her to go PassAgentVPSlash vps np = { - s = \\vf,pol => vps.s ! Passive ! pol ++ (applyPrep by8agent_Prep np) ; + s = \\vf,pol => vps.s ! Passive ! pol ++ vps.adjCompl ++ (applyPrep by8agent_Prep np); }; + -- PassAgentVPSlash vps np = { + -- s = \\vf,pol => vps.s ! Passive ! pol ++ (applyPrep by8agent_Prep np) ; + -- }; + -- MkVPS2 : Temp -> Pol -> VPSlash -> VPS2 ; -- has loved diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf index 1865aaeb..6ca8163b 100644 --- a/src/malay/LexiconMay.gf +++ b/src/malay/LexiconMay.gf @@ -27,7 +27,7 @@ lin bank_N = mkN "bank" ; lin beautiful_A = mkA "cantik" ; -- lin become_VA = mkVA "jadi" ; lin beer_N = mkN "bir" ; -lin beg_V2V = mkV2 "seru" ; +lin beg_V2V = mkV2 "rayu" ; -- lin belly_N = mkN "" ; lin big_A = mkA "besar" ; lin bike_N = mkN "basikal" ; diff --git a/src/malay/VerbMay.gf b/src/malay/VerbMay.gf index 4f969449..ed54f19b 100644 --- a/src/malay/VerbMay.gf +++ b/src/malay/VerbMay.gf @@ -74,13 +74,12 @@ lin -- : V2V -> VP -> VPSlash ; -- beg (her) to go SlashV2V v2 vp = useV { - s = \\vf => v2.s ! vf ++ for_Prep.s ++ vp.s ! Root ! Pos; + s = \\vf => v2.s ! vf; } ** { - c2 = v2.c2; - adjCompl = []; + c2 = v2.c2 ; + adjCompl = for_Prep.s ++ vp.s ! Root ! Pos; } ; - -- : V2S -> S -> VPSlash ; -- answer (to him) that it is good SlashV2S v2 s = useV v2 ** { c2 = v2.c2; diff --git a/src/malay/unittest/questions.gftest b/src/malay/unittest/questions.gftest index 865fb532..78634e9d 100644 --- a/src/malay/unittest/questions.gftest +++ b/src/malay/unittest/questions.gftest @@ -74,8 +74,8 @@ LangMay: apa daging yang dimakan AllEngAbs: (PassAgentVPSlash (SlashV2V beg_V2V (UseV go_V)) (UsePron i_Pron)) AllEng: be begged to go by me -AllMay: diseru untuk pergi olehku +AllMay: dirayu untuk pergi olehku AllEngAbs: (PassVPSlash (SlashV2V beg_V2V (UseV sleep_V))) AllEng: be begged to sleep -AllMay: diseru untuk tidur \ No newline at end of file +AllMay: dirayu untuk tidur \ No newline at end of file diff --git a/src/malay/unittest/tenses.gftest b/src/malay/unittest/tenses.gftest index da1b8df1..c0f5df54 100644 --- a/src/malay/unittest/tenses.gftest +++ b/src/malay/unittest/tenses.gftest @@ -13,8 +13,9 @@ Lang: UseCl (TTAnt TFut ASimul) PPos (PredVP (DetCN (DetQuant DefArt NumSg) (Use LangEng: the cat will walk LangMay: kucing akan berjalan -Lang: PredVP (UsePron i_Pron) (ComplSlash (SlashV2V beg_V2V (UseV go_V)) (UsePron she_Pron)) +Lang: UttS (UseCl (TTAnt TPast ASimul) PPos (PredVP (UsePron i_Pron) (ComplSlash (SlashV2V beg_V2V (UseV go_V)) (DetNP (DetQuant (PossPron she_Pron) NumPl))))) LangEng: I begged her to go +LangMay: aku merayu dia untuk pergi ------------- -- Conditions