diff --git a/src/malay/LexiconMay.gf b/src/malay/LexiconMay.gf index 2a83e96d..1865aaeb 100644 --- a/src/malay/LexiconMay.gf +++ b/src/malay/LexiconMay.gf @@ -211,7 +211,7 @@ lin king_N = mkN "raja" ; -- lin language_N = mkN "" ; -- lin laugh_V = mkV "" ; -- lin leaf_N = mkN "" ; -lin learn_V2 = mkV2 (prefixV (mkV "ajar" Ber)) emptyPrep ; +lin learn_V2 = mkV2 (prefixV (mkV "belajar" NoPrefix)) emptyPrep ; -- lin leather_N = mkN "" ; -- lin leave_V2 = mkV2 "" ; -- lin leg_N = mkN "" ; @@ -293,7 +293,7 @@ lin queen_N = mkN "ratu" ; -- lin radio_N = mkN "" ; lin rain_N = mkN "hujan" ; lin rain_V0 = mkV "hujan" ; -lin read_V2 = mkV2 "baca" ; +lin read_V2 = mkV2 (prefixV (mkV "baca" Meng)) emptyPrep ; -- lin ready_A = mkA "" ; -- lin reason_N = mkN "" ; -- lin red_A = mkA "" ; @@ -378,7 +378,7 @@ lin stop_V = mkV "henti" ; -- lin table_N = mkN "" ; -- lin tail_N = mkN "" ; lin talk_V3 = mkV3 (mkV "cakap" Ber) (mkPrep "tentang") (mkPrep "dengan") ; -lin teach_V2 = mkV2 "ajar" ; +lin teach_V2 = mkV2 (prefixV (mkV "ajar" Meng)) emptyPrep; -- lin teacher_N = mkN "" ; -- lin television_N = mkN "" ; -- lin thick_A = mkA "" ; @@ -408,7 +408,7 @@ lin ugly_A = mkA "jelek" ; -- W - Y -- lin wait_V2 = mkV2 "" ; -lin walk_V = mkV "jalan" ; +lin walk_V = (prefixV (mkV "jalan" Ber)) ; -- lin war_N = mkN "" ; -- lin warm_A = mkA "" ; -- lin wash_V2 = mkV2 "" ; diff --git a/src/malay/ParamMay.gf b/src/malay/ParamMay.gf index 5ea50b37..af9f0cd3 100644 --- a/src/malay/ParamMay.gf +++ b/src/malay/ParamMay.gf @@ -27,8 +27,11 @@ oper prefix : Prefix -> Str -> Str = \p -> case p of { Meng => prefixMeng ; - Ber => prefixBer + Ber => prefixBer ; + NoPrefix => prefixNone } ; + + prefixNone : Str -> Str = \belajar -> belajar ; prefixMeng : Str -> Str = \makan -> case makan of { @@ -63,8 +66,6 @@ oper } ; prefixBer : Str -> Str = \jalan -> case jalan of { - -- Exception - "ajar" => "belajar" ; -- Drop the r (#c + "er" + _ -- be+kerja @@ -149,6 +150,7 @@ param Prefix = Meng | Ber + | NoPrefix ; -- TODO more? -------------------------------------------------------------------------------- diff --git a/src/malay/VerbMay.gf b/src/malay/VerbMay.gf index 3492bc34..4f969449 100644 --- a/src/malay/VerbMay.gf +++ b/src/malay/VerbMay.gf @@ -56,7 +56,8 @@ lin -- : V3 -> NP -> VPSlash ; -- give (it) to her Slash3V3 v3 iobj = useV { - s = \\vf => v3.s ! vf ++ applyPrep v3.c2 iobj ++ applyPrep v3.c3 emptyNP ; + s = \\vf => v3.s ! vf ++ applyPrep v3.c2 iobj ++ + applyPrep v3.c3 emptyNP ; --iobj.s ! Bare -- applyPrep v3.c3 iobj -- TODO check if this works for all -- probably not } ** { c2 = v3.c2 ;-- Now the VPSlash is missing only the direct object