add one more conjunction

This commit is contained in:
Krasimir Angelov
2018-08-07 11:49:22 +02:00
parent e6f924d597
commit 5bb454454a
5 changed files with 15 additions and 15 deletions

View File

@@ -68,7 +68,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef
-- Structural
Conj = {s : Str; distr : Bool; conj : Ints 3; n : Number} ;
Conj = {s : Str; distr : Bool; conj : Ints 4; n : Number} ;
Subj = {s : Str} ;
Prep = {s : Str; c : Case} ;

View File

@@ -87,13 +87,13 @@ concrete ConjunctionBul of Conjunction =
g = x.g} ;
lincat
[S] = {s : Bool => Ints 3 => Str} ;
[Adv] = {s : Bool => Ints 3 => Str} ;
[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; isPre : Bool} ;
[RS] = {s : Bool => Ints 3 => Agr => Str} ;
[CN] = {s : Bool => Ints 3 => NForm => Str; g : AGender} ;
[S] = {s : Bool => Ints 4 => Str} ;
[Adv] = {s : Bool => Ints 4 => Str} ;
[AdV] = {s : Bool => Ints 4 => Str} ;
[IAdv] = {s : Bool => Ints 4 => QForm => Str} ;
[NP] = {s : Bool => Ints 4 => Role => Str; gn : GenNum; p : PronPerson} ;
[AP] = {s : Bool => Ints 4 => AForm => Person => Str; isPre : Bool} ;
[RS] = {s : Bool => Ints 4 => Agr => Str} ;
[CN] = {s : Bool => Ints 4 => NForm => Str; g : AGender} ;
}

View File

@@ -112,7 +112,7 @@ lin
lincat
VPS = {s : Agr => Str} ;
[VPS] = {s : Bool => Ints 3 => Agr => Str} ;
[VPS] = {s : Bool => Ints 4 => Agr => Str} ;
lin
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;

View File

@@ -57,7 +57,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
lincat
VPI = {s : Agr => Str} ;
[VPI] = {s : Bool => Ints 3 => Agr => Str} ;
[VPI] = {s : Bool => Ints 4 => Agr => Str} ;
lin
BaseVPI x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
@@ -72,7 +72,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
lincat
VPS = {s : Agr => Str} ;
[VPS] = {s : Bool => Ints 3 => Agr => Str} ;
[VPS] = {s : Bool => Ints 4 => Agr => Str} ;
lin
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;

View File

@@ -827,10 +827,10 @@ resource ResBul = ParamX ** open Prelude, Predef in {
GPl => "òåçè"
} ;
linCoord : Ints 3 => Str ;
linCoord = table {0 => "è"; 1=>"èëè"; 2=>"íèòî"; 3=>"íî"} ;
linCoord : Ints 4 => Str ;
linCoord = table {0 => "è"; 1=>"èëè"; 2=>"íèòî"; 3=>"íî"; 4=>"âìåñòî"} ;
linCoordSep : Str -> Bool => Ints 3 => Str ;
linCoordSep : Str -> Bool => Ints 4 => Str ;
linCoordSep s = table {True => linCoord; False=> \\_ => s} ;
hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ;