forked from GitHub/gf-rgl
add one more conjunction
This commit is contained in:
@@ -68,7 +68,7 @@ concrete CatBul of Cat = CommonX - [IAdv,AdV,SC] ** open ResBul, Prelude, Predef
|
|||||||
|
|
||||||
-- Structural
|
-- Structural
|
||||||
|
|
||||||
Conj = {s : Str; distr : Bool; conj : Ints 3; n : Number} ;
|
Conj = {s : Str; distr : Bool; conj : Ints 4; n : Number} ;
|
||||||
Subj = {s : Str} ;
|
Subj = {s : Str} ;
|
||||||
Prep = {s : Str; c : Case} ;
|
Prep = {s : Str; c : Case} ;
|
||||||
|
|
||||||
|
|||||||
@@ -87,13 +87,13 @@ concrete ConjunctionBul of Conjunction =
|
|||||||
g = x.g} ;
|
g = x.g} ;
|
||||||
|
|
||||||
lincat
|
lincat
|
||||||
[S] = {s : Bool => Ints 3 => Str} ;
|
[S] = {s : Bool => Ints 4 => Str} ;
|
||||||
[Adv] = {s : Bool => Ints 3 => Str} ;
|
[Adv] = {s : Bool => Ints 4 => Str} ;
|
||||||
[AdV] = {s : Bool => Ints 3 => Str} ;
|
[AdV] = {s : Bool => Ints 4 => Str} ;
|
||||||
[IAdv] = {s : Bool => Ints 3 => QForm => Str} ;
|
[IAdv] = {s : Bool => Ints 4 => QForm => Str} ;
|
||||||
[NP] = {s : Bool => Ints 3 => Role => Str; gn : GenNum; p : PronPerson} ;
|
[NP] = {s : Bool => Ints 4 => Role => Str; gn : GenNum; p : PronPerson} ;
|
||||||
[AP] = {s : Bool => Ints 3 => AForm => Person => Str; isPre : Bool} ;
|
[AP] = {s : Bool => Ints 4 => AForm => Person => Str; isPre : Bool} ;
|
||||||
[RS] = {s : Bool => Ints 3 => Agr => Str} ;
|
[RS] = {s : Bool => Ints 4 => Agr => Str} ;
|
||||||
[CN] = {s : Bool => Ints 3 => NForm => Str; g : AGender} ;
|
[CN] = {s : Bool => Ints 4 => NForm => Str; g : AGender} ;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ lin
|
|||||||
|
|
||||||
lincat
|
lincat
|
||||||
VPS = {s : Agr => Str} ;
|
VPS = {s : Agr => Str} ;
|
||||||
[VPS] = {s : Bool => Ints 3 => Agr => Str} ;
|
[VPS] = {s : Bool => Ints 4 => Agr => Str} ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
|
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
|
|||||||
|
|
||||||
lincat
|
lincat
|
||||||
VPI = {s : Agr => Str} ;
|
VPI = {s : Agr => Str} ;
|
||||||
[VPI] = {s : Bool => Ints 3 => Agr => Str} ;
|
[VPI] = {s : Bool => Ints 4 => Agr => Str} ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
BaseVPI x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
|
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
|
lincat
|
||||||
VPS = {s : Agr => Str} ;
|
VPS = {s : Agr => Str} ;
|
||||||
[VPS] = {s : Bool => Ints 3 => Agr => Str} ;
|
[VPS] = {s : Bool => Ints 4 => Agr => Str} ;
|
||||||
|
|
||||||
lin
|
lin
|
||||||
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
|
BaseVPS x y = {s = \\d,t,a=>x.s!a++linCoord!t++y.s!a} ;
|
||||||
|
|||||||
@@ -827,10 +827,10 @@ resource ResBul = ParamX ** open Prelude, Predef in {
|
|||||||
GPl => "òåçè"
|
GPl => "òåçè"
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
linCoord : Ints 3 => Str ;
|
linCoord : Ints 4 => Str ;
|
||||||
linCoord = table {0 => "è"; 1=>"èëè"; 2=>"íèòî"; 3=>"íî"} ;
|
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} ;
|
linCoordSep s = table {True => linCoord; False=> \\_ => s} ;
|
||||||
|
|
||||||
hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ;
|
hyphen : Str = SOFT_BIND ++ "-" ++ SOFT_BIND ;
|
||||||
|
|||||||
Reference in New Issue
Block a user