diff --git a/src/persian/CatPes.gf b/src/persian/CatPes.gf index b2f926a0..cfcce220 100644 --- a/src/persian/CatPes.gf +++ b/src/persian/CatPes.gf @@ -18,7 +18,7 @@ concrete CatPes of Cat = CommonX ** open ResPes, Prelude in { vp : ResPes.TAnt => Polarity => Order => Str ; c2 : ResPes.Compl } ; - Imp = {s : Polarity => ImpForm => Str} ; + Imp = {s : Polarity => Number => Str} ; ---- Question QCl = {s : ResPes.TAnt => Polarity => Str} ; diff --git a/src/persian/PhrasePes.gf b/src/persian/PhrasePes.gf index 419e6a48..89a3549a 100644 --- a/src/persian/PhrasePes.gf +++ b/src/persian/PhrasePes.gf @@ -3,9 +3,9 @@ concrete PhrasePes of Phrase = CatPes ** open Prelude, ResPes in { lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; UttS s = {s = s.s ! Indic} ; - UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg False} ; - UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Pl False} ; - UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! ImpF Sg True} ; + UttImpSg pol imp = {s = pol.s ++ imp.s ! pol.p ! Sg} ; + UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ; + UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Pl} ; UttIP, --- Acc also UttQS, diff --git a/src/persian/SentencePes.gf b/src/persian/SentencePes.gf index 6c6b40fe..7d667886 100644 --- a/src/persian/SentencePes.gf +++ b/src/persian/SentencePes.gf @@ -11,8 +11,8 @@ concrete SentencePes of Sentence = CatPes ** open Prelude, ResPes,Predef in { ImpVP vp = { s = \\pol,n => - let agr = Ag (numImp n) P2 ; - vps = vp.prefix ++ vp.s ! VImp pol (numImp n) + let agr = Ag n P2 ; + vps = vp.prefix ++ vp.s ! VImp pol n in case vp.vvtype of { NoVV => vp.ad ++ vp.comp ! agr ++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vps ++ vp.embComp ; _ => vps ++ vp.ad ++ vp.comp ! agr ++ vp.obj ++ vp.vComp ! agr ! VVPres ++ vp.embComp }