diff --git a/lib/src/polish/CatPol.gf b/lib/src/polish/CatPol.gf index 63a028745..ab8a5ca44 100644 --- a/lib/src/polish/CatPol.gf +++ b/lib/src/polish/CatPol.gf @@ -2,7 +2,7 @@ -- Adam Slaski, 2009 -concrete CatPol of Cat = CommonPol ** open ResPol, Prelude, (R = ParamX) in { +concrete CatPol of Cat = CommonX - [CAdv] ** open ResPol, Prelude, (R = ParamX) in { flags optimize=all_subs; coding=utf8; @@ -124,5 +124,7 @@ concrete CatPol of Cat = CommonPol ** open ResPol, Prelude, (R = ParamX) in { N3 = {s : SubstForm => Str; g : Gender} ** { c, c2 : Complement } ; PN = NounPhrase; + + CAdv = {s,p,sn,pn : Str} ; }; diff --git a/lib/src/polish/CommonPol.gf b/lib/src/polish/CommonPol.gf deleted file mode 100644 index 8d8af3edb..000000000 --- a/lib/src/polish/CommonPol.gf +++ /dev/null @@ -1,34 +0,0 @@ -concrete CommonPol of Common = open (R = ParamX) in { - - lincat - Text = {s : Str} ; --lock_Text : {}} ; - Phr = {s : Str} ; --lock_Phr : {}} ; - Utt = {s : Str} ; --lock_Utt : {}} ; - Voc = {s : Str} ; --lock_Voc : {}} ; - SC = {s : Str} ; --lock_SC : {}} ; - Adv = {s : Str} ; --lock_Adv : {}} ; - AdV = {s : Str} ; --lock_AdV : {}} ; - AdA = {s : Str} ; --lock_AdA : {}} ; - AdN = {s : Str} ; --lock_AdN : {}} ; - IAdv = {s : Str} ; --lock_IAdv : {}} ; - CAdv = {s,p,sn,pn : Str} ; --lock_CAdv : {}} ; - PConj = {s : Str} ; --lock_PConj : {}} ; - - Temp = {s : Str ; t : R.Tense ; a : R.Anteriority} ; - Tense = {s : Str ; t : R.Tense} ; - Ant = {s : Str ; a : R.Anteriority} ; - Pol = {s : Str ; p : R.Polarity} ; - - lin - TTAnt t a = {s = t.s ++ a.s ; t = t.t ; a = a.a} ; - - PPos = {s = []} ** {p = R.Pos} ; - PNeg = {s = []} ** {p = R.Neg} ; - TPres = {s = []} ** {t = R.Pres} ; - TPast = {s = []} ** {t = R.Past} ; --# notpresent - TFut = {s = []} ** {t = R.Fut} ; --# notpresent - TCond = {s = []} ** {t = R.Cond} ; --# notpresent - ASimul = {s = []} ** {a = R.Simul} ; - AAnter = {s = []} ** {a = R.Anter} ; --# notpresent - -}