diff --git a/src/rukiga/AdjectiveCgg.gf b/src/rukiga/AdjectiveCgg.gf index e09bcfb3f..1bc361612 100755 --- a/src/rukiga/AdjectiveCgg.gf +++ b/src/rukiga/AdjectiveCgg.gf @@ -5,12 +5,14 @@ concrete AdjectiveCgg of Adjective = CatCgg ** lin -PositA a = a; + PositA a = {s=\\_=> a.s; position1= a.position1; isProper = a.isProper; isPrep = a.isPrep}; -- The superlative use is covered in $Ord$. - --AdjOrd : Ord -> AP ; -- warmest - AdjOrd ord = {s= ord.s; position1= ord.position1}; + --AdjOrd : Ord -> AP ; -- warmest + AdjOrd ord = {s= \\agr => ord.s!agr ; position1= ord.position1; isProper = False; isPrep = False}; + -- UseComparA : A -> AP ; -- warmer + UseComparA a ={s =\\_ => a.s ++ BIND ++ "ho" ++ "kukira"; position1= a.position1; isProper = a.isProper; isPrep = a.isPrep}; {- abstract Adjective = Cat ** { diff --git a/src/rukiga/NounCgg.gf b/src/rukiga/NounCgg.gf index f9a65ee99..991969bd6 100755 --- a/src/rukiga/NounCgg.gf +++ b/src/rukiga/NounCgg.gf @@ -32,28 +32,28 @@ lin AdjCN ap cn = case of { => { - s = \\ num, ns =>ap.s ++ cn.s ! num ! ns ; + s = \\ num, ns =>ap.s ! AgP3 Sg KI_BI ++ cn.s ! num ! ns ; gender = cn.gender }; => case ap.isPrep of { False => { s = \\ num, ns => cn.s ! num ! ns ++ mkAdjPronIVClitic (AgP3 num cn.gender) - ++ ap.s; + ++ ap.s ! AgP3 Sg KI_BI; gender = cn.gender }; True => { s = \\ num, ns => (cn.s ! num ! ns) ++ - mkGenPrepNoIVClitic (AgP3 num cn.gender) ++ ap.s ; + mkGenPrepNoIVClitic (AgP3 num cn.gender) ++ ap.s ! AgP3 Sg KI_BI; gender = cn.gender } }; => { s = \\ num, ns => mkAdjPronIVClitic (AgP3 num cn.gender) - ++ ap.s ++ (cn.s ! num ! ns) ; + ++ ap.s ! AgP3 Sg KI_BI ++ (cn.s ! num ! ns) ; gender = cn.gender }; => { - s = \\ num, ns => (cn.s ! num ! ns) ++ ap.s ; + s = \\ num, ns => (cn.s ! num ! ns) ++ ap.s ! AgP3 Sg KI_BI; gender = cn.gender } @@ -141,7 +141,7 @@ lin --AdjDAP : DAP -> AP -> DAP ; -- the large (one) AdjDAP dap ap = - { s = dap.s ++ ap.s ; + { s = dap.s ++ ap.s! AgP3 Sg KI_BI ; -- does no harm since they are all same strings s2 = dap.s2; ntype = dap.ntype ; num = dap.num ;