diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf index ee6ee3bd..ff04ce65 100644 --- a/src/malay/LexiconMay.gf +++ b/src/malay/LexiconMay.gf @@ -9,7 +9,7 @@ lin airplane_N = mkN "kapal terbang" ; -- lin alas_Interj = mkInterj "" ; lin already_Adv = mkA "sudah" ; lin animal_N = mkN "haiwan" ; --- lin answer_V2S = mkV2S "jawab" ; +lin answer_V2S = mkV2S "jawab" ; lin apartment_N = mkN "pangsapuri" ; lin apple_N = mkN "epal" ; lin art_N = mkN "seni" ; diff --git a/src/malay/MissingMay.gf b/src/malay/MissingMay.gf index d7aeb941..8d4870cc 100644 --- a/src/malay/MissingMay.gf +++ b/src/malay/MissingMay.gf @@ -102,7 +102,6 @@ oper SelfNP : NP -> NP = notYet "SelfNP" ; oper SentAP : AP -> SC -> AP = notYet "SentAP" ; oper SentCN : CN -> SC -> CN = notYet "SentCN" ; oper SlashV2Q : V2Q -> QS -> VPSlash = notYet "SlashV2Q" ; -oper SlashV2S : V2S -> S -> VPSlash = notYet "SlashV2S" ; oper SlashV2VNP : V2V -> NP -> VPSlash -> VPSlash = notYet "SlashV2VNP" ; oper SlashVS : NP -> VS -> SSlash -> ClSlash = notYet "SlashVS" ; oper Use2N3 : N3 -> N2 = notYet "Use2N3" ; diff --git a/src/malay/ParadigmsMay.gf b/src/malay/ParadigmsMay.gf index 7d5e1ba1..c59f23ce 100644 --- a/src/malay/ParadigmsMay.gf +++ b/src/malay/ParadigmsMay.gf @@ -66,6 +66,12 @@ oper mkV2V : Str -> V2V ; mkV2V : V -> Prep -> Prep -> V2V ; } ; + + mkV2S : overload { + mkV2S : Str -> V2S ; + mkV2S : V -> Prep -> V2S ; + } ; + -- mkVQ : Str -> VQ -- = \s -> lin VQ (regV s) ; @@ -73,8 +79,6 @@ oper -- -- mkV2A : Str -> V2A -- = \s -> lin V2A (regV s ** {c2 = noPrep}) ; - -- mkV2V : Str -> V2V - -- = \s -> lin V2V (regV s ** {c2 = noPrep}) ; -- mkV2Q : Str -> V2Q -- = \s -> lin V2Q (regV s ** {c2 = noPrep}) ; @@ -180,6 +184,12 @@ oper mkV2V : Str -> V2V = \v -> lin V2V (mkVerb2 (regVerb v Meng) dirPrep) ; mkV2V : V -> Prep -> Prep -> V2V = \v,p1,p2 -> lin V2V (mkVerb3 v p1 p2) } ; + + mkV2S = overload { + mkV2S : Str -> V2S = \v -> lin V2S (mkVerb2 (regVerb v Meng) dirPrep) ; + mkV2S : V -> Prep -> V2S = \v,p -> lin V22 (mkVerb2 v p) + } ; + -- lin like_V2 = let like' : V2 = mkV2 "suka" in like' ** { -- s = table {Passive => "disukai" ; _ => "suka"} ; -- } ; diff --git a/src/malay/VerbMay.gf b/src/malay/VerbMay.gf index 1fb5d67e..d071aac2 100644 --- a/src/malay/VerbMay.gf +++ b/src/malay/VerbMay.gf @@ -81,12 +81,10 @@ lin -- : V2S -> S -> VPSlash ; -- answer (to him) that it is good - -- SlashV2S v2 s = useV { - -- s = \\vf => v2.s ! vf; - -- } ** { - -- c2 = v2.c2; - -- sCompl = s.s - -- } ; + SlashV2S v2 s = useV v2 ** { + c2 = v2.c2; + adjCompl = "yang" ++ s.s ; -- TODO check /Inari + } ; {- diff --git a/src/malay/unittest/complements.gftest b/src/malay/unittest/complements.gftest index 04cfc950..9e07837e 100644 --- a/src/malay/unittest/complements.gftest +++ b/src/malay/unittest/complements.gftest @@ -4,3 +4,10 @@ LangMay: dia memberi kucing kepadaku Lang: UttS (UseCl (TTAnt TPres ASimul) PPos (PredVP (UsePron he_Pron) (ComplSlash (Slash3V3 give_V3 (UsePron i_Pron)) (MassNP (UseN cat_N))))) LangMay: dia memberi aku kucing + +-- Sentence complements + +-- added by Inari, TODO check +Lang: PredVP (UsePron she_Pron) (ComplSlash (SlashV2S answer_V2S (UseCl (TTAnt TPres ASimul) PPos (PredVP (MassNP (UseN dog_N)) (ComplSlash (SlashV2a eat_V2) (MassNP (UseN cat_N)))))) (UsePron i_Pron)) +LangMay: dia menjawab aku yang anjing makan kucing +