field adv in AP is not used. Removing it simplifies the code.

This commit is contained in:
Krasimir Angelov
2018-07-15 11:18:56 +02:00
parent ed60efd385
commit 0e126a24e0
3 changed files with 5 additions and 18 deletions
+2 -13
View File
@@ -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
} ;