diff --git a/src/rukiga/AdjectiveCgg.gf b/src/rukiga/AdjectiveCgg.gf index df222a15b..e09bcfb3f 100755 --- a/src/rukiga/AdjectiveCgg.gf +++ b/src/rukiga/AdjectiveCgg.gf @@ -7,6 +7,10 @@ lin PositA a = a; + -- The superlative use is covered in $Ord$. + + --AdjOrd : Ord -> AP ; -- warmest + AdjOrd ord = {s= ord.s; position1= ord.position1}; {- abstract Adjective = Cat ** { diff --git a/src/rukiga/CatCgg.gf b/src/rukiga/CatCgg.gf index 6931d7a14..6aa10c53d 100755 --- a/src/rukiga/CatCgg.gf +++ b/src/rukiga/CatCgg.gf @@ -29,7 +29,7 @@ lincat Det = Res.Determiner ; -- determiner phrase e.g. "those seven" Quant = {s : Res.Pronoun; s2 :Res.Agreement => Str; doesAgree : Bool; isPron: Bool} ; -- quantifier ('nucleus' of Det) e.g. "this/these" Num = Res.Numer ; -- number determining element e.g. "seven" - AP = {s : Str ; position1 : Res.Position1; isProper : Bool; isPrep: Bool};--Res.AdjectivalPhrase; + AP = {s :Res.Agreement=> Str ; position1 : Res.Position1; isProper : Bool; isPrep: Bool};--Res.AdjectivalPhrase; A = Res.Adjective; Comp = Res.Comp; -- complement of copula, such as AP e.g. "very warm" diff --git a/src/rukiga/VerbCgg.gf b/src/rukiga/VerbCgg.gf index 866d783c8..700cb6c4d 100755 --- a/src/rukiga/VerbCgg.gf +++ b/src/rukiga/VerbCgg.gf @@ -41,7 +41,7 @@ lin }; --its not generating any sentence -- CompAP : AP -> Comp; -- (be) small - CompAP ap = {s=ap.s}; + CompAP ap = {s=ap.s! AgP3 Sg KI_BI}; -- used a hack. -- CompNP : NP -> Comp ; -- (be) the man CompNP np = {s= np.s ! Acc}; --{s =[] ; post =np.s; isPre = False; isProper = Bool; isPrep: Bool}; @@ -309,10 +309,10 @@ lin pres =va.pres; perf=va.perf; morphs = va.morphs; - comp=ap.s ; + comp=[] ; comp2 = []; - ap =[]; - isCompApStem = False; + ap = ap.s! AgP3 Sg KI_BI; + isCompApStem = True; agr = AgrNo; isRegular = va.isRegular; adv =[];