diff --git a/src/bulgarian/AdjectiveBul.gf b/src/bulgarian/AdjectiveBul.gf index 56d093fb1..9480889f8 100644 --- a/src/bulgarian/AdjectiveBul.gf +++ b/src/bulgarian/AdjectiveBul.gf @@ -5,24 +5,20 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in { lin PositA a = { s = \\aform,_ => a.s ! aform ; - adv = a.adv ; isPre = a.isPre } ; ComparA a np = { - s = \\aform,_ => "по" ++ hyphen ++ a.s ! aform ++ "от" ++ np.s ! RObj CPrep ; - adv = "по" ++ hyphen ++ a.adv ++ "от" ++ np.s ! RObj CPrep ; + s = \\aform,_ => "по" ++ hyphen ++ a.s ! aform ++ "от" ++ np.s ! RObj CPrep ; isPre = True } ; UseComparA a = { s = \\aform,_ => "по" ++ hyphen ++ a.s ! aform ; - adv = "по" ++ hyphen ++ a.adv ; isPre = True } ; AdjOrd ord = { s = \\aform,_ => ord.s ! aform ; - adv = ord.s ! ASg Neut Indef ; isPre = True } ; @@ -30,43 +26,36 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in { CAdvAP ad ap np = { s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.p ++ np.s ! RObj CPrep ; - adv = ad.s ++ ap.adv ++ ad.p ++ np.s ! RObj CPrep ; isPre = False } ; ComplA2 a np = { s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj CPrep ; - adv = a.adv ++ a.c2 ++ np.s ! RObj CPrep ; isPre = False } ; ReflA2 a = { - s = \\aform,_ => a.s ! aform ++ a.c2 ++ ["себе си"] ; - adv = a.adv ++ a.c2 ++ ["себе си"] ; + s = \\aform,_ => a.s ! aform ++ a.c2 ++ ["себе си"] ; isPre = False } ; SentAP ap sc = { s = \\a,p => ap.s ! a ! p ++ sc.s ! {gn=aform2gennum a; p=p} ; - adv = ap.adv ++ sc.s ! agrP3 (GSg Neut) ; isPre = False } ; AdAP ada ap = { s = \\a,p => ada.s ++ ap.s ! a ! p ; - adv = ada.s ++ ap.adv ; isPre = ap.isPre } ; UseA2 a = { s = \\aform,p => a.s ! aform ; - adv = a.adv ; isPre = True } ; AdvAP ap adv = { s = \\aform,p => ap.s ! aform ! p ++ adv.s ; - adv = ap.adv ++ adv.s; isPre = False } ; diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf index 44cdd6702..ff9dae153 100644 --- a/src/bulgarian/CatBul.gf +++ b/src/bulgarian/CatBul.gf @@ -40,7 +40,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef -- Adjective - AP = {s : AForm => Person => Str; adv : Str; isPre : Bool} ; + AP = {s : AForm => Person => Str; isPre : Bool} ; -- Adverb diff --git a/src/bulgarian/ConjunctionBul.gf b/src/bulgarian/ConjunctionBul.gf index 20e0e7411..4c30c176e 100644 --- a/src/bulgarian/ConjunctionBul.gf +++ b/src/bulgarian/ConjunctionBul.gf @@ -68,12 +68,10 @@ concrete ConjunctionBul of Conjunction = p = x.p} ; BaseAP x y = - {s = \\d,t,aform,p => x.s!aform!p++linCoord!t++y.s!aform!p; - adv= \\d,t => x.adv ++linCoord!t++y.adv; + {s = \\d,t,aform,p => x.s!aform!p++linCoord!t++y.s!aform!p; isPre = andB x.isPre y.isPre} ; ConsAP x xs = {s = \\d,t,aform,p =>x.s!aform!p++(linCoordSep comma)!d!t++xs.s!d!t!aform!p; - adv= \\d,t =>x.adv ++(linCoordSep comma)!d!t++xs.adv!d!t; isPre = andB x.isPre xs.isPre} ; BaseRS x y = @@ -94,7 +92,7 @@ concrete ConjunctionBul of Conjunction = [AdV] = {s : Bool => Ints 3 => Str} ; [IAdv] = {s : Bool => Ints 3 => QForm => Str} ; [NP] = {s : Bool => Ints 3 => Role => Str; gn : GenNum; p : PronPerson} ; - [AP] = {s : Bool => Ints 3 => AForm => Person => Str; adv : Bool => Ints 3 => Str; isPre : Bool} ; + [AP] = {s : Bool => Ints 3 => AForm => Person => Str; isPre : Bool} ; [RS] = {s : Bool => Ints 3 => Agr => Str} ; [CN] = {s : Bool => Ints 3 => NForm => Str; g : AGender} ;