From e71b54318f424c35723eddeb528ca7a54482f9ca Mon Sep 17 00:00:00 2001 From: krasimir Date: Fri, 13 Jun 2008 11:59:32 +0000 Subject: [PATCH] fix the [AP] construction in bulgarian-1.4 --- lib/resource-1.4/bulgarian/ConjunctionBul.gf | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/resource-1.4/bulgarian/ConjunctionBul.gf b/lib/resource-1.4/bulgarian/ConjunctionBul.gf index dc009dab2..028e3270c 100644 --- a/lib/resource-1.4/bulgarian/ConjunctionBul.gf +++ b/lib/resource-1.4/bulgarian/ConjunctionBul.gf @@ -13,7 +13,9 @@ concrete ConjunctionBul of Conjunction = a = {gn = conjGenNum (gennum DMasc conj.n) ss.a.gn; p = ss.a.p} } ; - ConjAP conj ss = conjunctDistrTable AForm conj ss ** { + ConjAP conj ss = { + s = \\aform => conj.s1++ ss.s1.s ! aform ++ conj.s2 ++ ss.s2.s ! aform; + adv = conj.s1++ ss.s1.adv ++ conj.s2 ++ ss.s2.adv; isPre = ss.isPre } ; @@ -28,12 +30,20 @@ concrete ConjunctionBul of Conjunction = BaseNP x y = twoTable Role x y ** {a = conjAgr x.a y.a} ; ConsNP xs x = consrTable Role comma xs x ** {a = conjAgr xs.a x.a} ; - BaseAP x y = twoTable AForm x y ** {isPre = andB x.isPre y.isPre} ; - ConsAP xs x = consrTable AForm comma xs x ** {isPre = andB xs.isPre x.isPre} ; + BaseAP x y = + {s1 = {s=x.s; adv=x.adv}; + s2 = {s=y.s; adv=y.adv}; + isPre = andB x.isPre y.isPre} ; + + ConsAP x xs = + {s1 = {s = \\aform => x.s ! aform ++ comma ++ xs.s1.s ! aform; + adv = x.adv ++ comma ++ xs.s1.adv}; + s2 = xs.s2; + isPre = andB x.isPre xs.isPre} ; lincat [S] = {s1,s2 : Str} ; [Adv] = {s1,s2 : Str} ; [NP] = {s1,s2 : Role => Str ; a : Agr} ; - [AP] = {s1,s2 : AForm => Str ; isPre : Bool} ; + [AP] = {s1,s2 : {s : AForm => Str; adv : Str}; isPre : Bool} ; }