diff --git a/src/rukiga/CatCgg.gf b/src/rukiga/CatCgg.gf index e5c4e7225..4e7960608 100755 --- a/src/rukiga/CatCgg.gf +++ b/src/rukiga/CatCgg.gf @@ -6,7 +6,7 @@ concrete CatCgg of Cat = CommonX -[Adv,IAdv, AdA]** lincat - Imp = {s : Bool => Str} ; + Imp = {s : Res. ImpPol=> Str} ; QS = {s : Str} ; -- Note: SS is a shorthand for {s:Str}, defined in Prelude.gf diff --git a/src/rukiga/PhraseCgg.gf b/src/rukiga/PhraseCgg.gf index 013b0db29..d8c7aa2a1 100755 --- a/src/rukiga/PhraseCgg.gf +++ b/src/rukiga/PhraseCgg.gf @@ -16,8 +16,8 @@ lin UttAdv adv = {s = adv.s}; --: Adv -> Utt ; -- in the house UttImpSg pol imp = {s = case pol.p of { - Pos => imp.s!True; - Neg => (mkSubjClitic (AgMUBAP2 Sg)) ++ imp.s!False + Pos => imp.s!ImpPos; + Neg => (mkSubjClitic (AgMUBAP2 Sg)) ++ imp.s!ImpNeg } };--: Pol -> Imp -> Utt ; -- (do not) walk ----s {- diff --git a/src/rukiga/ResCgg.gf b/src/rukiga/ResCgg.gf index 8ad45b679..4413b6934 100755 --- a/src/rukiga/ResCgg.gf +++ b/src/rukiga/ResCgg.gf @@ -35,6 +35,8 @@ param GenPrep2 | GenAdj | SStandPron ; --Self-standing pronouns + + ImpPol = ImpPos | ImpNeg; {- --there are several and i.e. -- na (two nouns, 2 Noun Phrases, 2 Pronouns, 2 relative subject clauses, ) diff --git a/src/rukiga/SentenceCgg.gf b/src/rukiga/SentenceCgg.gf index 2bcf64598..48890cf4a 100755 --- a/src/rukiga/SentenceCgg.gf +++ b/src/rukiga/SentenceCgg.gf @@ -83,8 +83,8 @@ lin ImpVP vp = { s =table{ - True=> vp.s ++ Predef.BIND ++ vp.morphs!VFInf!RestOfVerb ++ vp.comp; - False => case vp.isCompApStem of { -- How do I make the number dynamic use case? + ImpPos => vp.s ++ Predef.BIND ++ vp.morphs!VFInf!RestOfVerb ++ vp.comp; + ImpNeg => case vp.isCompApStem of { -- How do I make the number dynamic use case? True =>vp.morphs!VFPres!SecNegM ++ Predef.BIND ++ vp.s ++ Predef.BIND ++ vp.morphs!VFInf!RestOfVerb ++ (mkAdjPronNoIVClitic (AgMUBAP2 Sg)) ++ vp.comp; False => vp.morphs!VFPres!SecNegM ++ Predef.BIND ++ vp.s ++ Predef.BIND ++