From 458706694dc472ffa46b38af679d55a66119af63 Mon Sep 17 00:00:00 2001 From: David Bamutura Date: Mon, 3 Jun 2019 20:46:19 +0200 Subject: [PATCH] =Corrected an error in paradigms to recognize smartNoun paradigm --- src/rukiga/ParadigmsCgg.gf | 2 +- src/rukiga/ResCgg.gf | 2 +- src/rukiga/StructuralCgg.gf | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rukiga/ParadigmsCgg.gf b/src/rukiga/ParadigmsCgg.gf index ffccce250..b94ad45c1 100755 --- a/src/rukiga/ParadigmsCgg.gf +++ b/src/rukiga/ParadigmsCgg.gf @@ -18,7 +18,7 @@ oper mkN = overload { mkN : (fish : Str) -> Gender -> N - = \fish,nclass -> lin N (mkNoun fish fish nclass) ; + = \fish,nclass -> lin N (smartNoun fish nclass) ; mkN : (man,men : Str) -> Gender -> N = \man,men,nclass -> lin N (mkNoun man men nclass) ; }; diff --git a/src/rukiga/ResCgg.gf b/src/rukiga/ResCgg.gf index ad24f77dc..1f43f2064 100755 --- a/src/rukiga/ResCgg.gf +++ b/src/rukiga/ResCgg.gf @@ -1080,7 +1080,7 @@ mkSubjPrefix : Agreement -> Str =\a ->case a of { case of { => {s = \\_=> subjClitic ++ cn.s!det.num! det.ntype ++ subjClitic ++ det.s; agr = AgP3 det.num cn.gender; nounCat = cn.nounCat}; => {s = \\_=>cn.s!det.num! det.ntype ++ subjClitic ++ det.s; agr = AgP3 det.num cn.gender; nounCat = cn.nounCat}; - => { s =\\_ => det.s ++ cn.s !n ! det.ntype; agr = AgP3 det.num cn.gender; nounCat = cn.nounCat} --; + => { s =\\_ => det.s ++ cn.s !n ! det.ntype; agr = AgP3 det.num cn.gender; nounCat = cn.nounCat} --; -- => {s = \\_=> cn.s!det.ntype!det.num; agr = AgP3 det.num cn.gender } }; diff --git a/src/rukiga/StructuralCgg.gf b/src/rukiga/StructuralCgg.gf index 579fda0c9..75b4c1d2e 100755 --- a/src/rukiga/StructuralCgg.gf +++ b/src/rukiga/StructuralCgg.gf @@ -42,6 +42,8 @@ lin in_Prep = mkPrep "omu" "omuri" False; --aha-ri Kamukuzi??? works for places on_Prep = mkPrep "aha" "ahari" False; + + in8front_Prep = mkPrep "enyuma ya" [] False; --: Prep ; -- in front of --na --please this string varies with vowels use combine_morphemes or --combine_words when using it. @@ -49,6 +51,7 @@ lin from_Prep =mkPrep "kurunga" "" False; under_Prep = mkPrep "hansi ya" "" False; + after_Prep = mkPrep "omu maisho" "" False; --: Prep ; ---Structural {-