1
0
forked from GitHub/gf-rgl

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

View File

@@ -5,24 +5,20 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
lin lin
PositA a = { PositA a = {
s = \\aform,_ => a.s ! aform ; s = \\aform,_ => a.s ! aform ;
adv = a.adv ;
isPre = a.isPre isPre = a.isPre
} ; } ;
ComparA a np = { ComparA a np = {
s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ++ "îò" ++ np.s ! RObj CPrep ; s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ++ "îò" ++ np.s ! RObj CPrep ;
adv = "ïî" ++ hyphen ++ a.adv ++ "îò" ++ np.s ! RObj CPrep ;
isPre = True isPre = True
} ; } ;
UseComparA a = { UseComparA a = {
s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ; s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ;
adv = "ïî" ++ hyphen ++ a.adv ;
isPre = True isPre = True
} ; } ;
AdjOrd ord = { AdjOrd ord = {
s = \\aform,_ => ord.s ! aform ; s = \\aform,_ => ord.s ! aform ;
adv = ord.s ! ASg Neut Indef ;
isPre = True isPre = True
} ; } ;
@@ -30,43 +26,36 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
CAdvAP ad ap np = { CAdvAP ad ap np = {
s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.p ++ np.s ! RObj CPrep ; 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 isPre = False
} ; } ;
ComplA2 a np = { ComplA2 a np = {
s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj CPrep ; s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj CPrep ;
adv = a.adv ++ a.c2 ++ np.s ! RObj CPrep ;
isPre = False isPre = False
} ; } ;
ReflA2 a = { ReflA2 a = {
s = \\aform,_ => a.s ! aform ++ a.c2 ++ ["ñåáå ñè"] ; s = \\aform,_ => a.s ! aform ++ a.c2 ++ ["ñåáå ñè"] ;
adv = a.adv ++ a.c2 ++ ["ñåáå ñè"] ;
isPre = False isPre = False
} ; } ;
SentAP ap sc = { SentAP ap sc = {
s = \\a,p => ap.s ! a ! p ++ sc.s ! {gn=aform2gennum a; p=p} ; s = \\a,p => ap.s ! a ! p ++ sc.s ! {gn=aform2gennum a; p=p} ;
adv = ap.adv ++ sc.s ! agrP3 (GSg Neut) ;
isPre = False isPre = False
} ; } ;
AdAP ada ap = { AdAP ada ap = {
s = \\a,p => ada.s ++ ap.s ! a ! p ; s = \\a,p => ada.s ++ ap.s ! a ! p ;
adv = ada.s ++ ap.adv ;
isPre = ap.isPre isPre = ap.isPre
} ; } ;
UseA2 a = { UseA2 a = {
s = \\aform,p => a.s ! aform ; s = \\aform,p => a.s ! aform ;
adv = a.adv ;
isPre = True isPre = True
} ; } ;
AdvAP ap adv = { AdvAP ap adv = {
s = \\aform,p => ap.s ! aform ! p ++ adv.s ; s = \\aform,p => ap.s ! aform ! p ++ adv.s ;
adv = ap.adv ++ adv.s;
isPre = False isPre = False
} ; } ;

View File

@@ -40,7 +40,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef
-- Adjective -- Adjective
AP = {s : AForm => Person => Str; adv : Str; isPre : Bool} ; AP = {s : AForm => Person => Str; isPre : Bool} ;
-- Adverb -- Adverb

View File

@@ -68,12 +68,10 @@ concrete ConjunctionBul of Conjunction =
p = x.p} ; p = x.p} ;
BaseAP x y = BaseAP x y =
{s = \\d,t,aform,p => x.s!aform!p++linCoord!t++y.s!aform!p; {s = \\d,t,aform,p => x.s!aform!p++linCoord!t++y.s!aform!p;
adv= \\d,t => x.adv ++linCoord!t++y.adv;
isPre = andB x.isPre y.isPre} ; isPre = andB x.isPre y.isPre} ;
ConsAP x xs = ConsAP x xs =
{s = \\d,t,aform,p =>x.s!aform!p++(linCoordSep comma)!d!t++xs.s!d!t!aform!p; {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} ; isPre = andB x.isPre xs.isPre} ;
BaseRS x y = BaseRS x y =
@@ -94,7 +92,7 @@ concrete ConjunctionBul of Conjunction =
[AdV] = {s : Bool => Ints 3 => Str} ; [AdV] = {s : Bool => Ints 3 => Str} ;
[IAdv] = {s : Bool => Ints 3 => QForm => Str} ; [IAdv] = {s : Bool => Ints 3 => QForm => Str} ;
[NP] = {s : Bool => Ints 3 => Role => Str; gn : GenNum; p : PronPerson} ; [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} ; [RS] = {s : Bool => Ints 3 => Agr => Str} ;
[CN] = {s : Bool => Ints 3 => NForm => Str; g : AGender} ; [CN] = {s : Bool => Ints 3 => NForm => Str; g : AGender} ;