From 5bb454454ab7c3f4d58acb3082cd1596939c1475 Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Tue, 7 Aug 2018 11:49:22 +0200 Subject: [PATCH] add one more conjunction --- src/bulgarian/CatBul.gf | 2 +- src/bulgarian/ConjunctionBul.gf | 16 ++++++++-------- src/bulgarian/ExtendBul.gf | 2 +- src/bulgarian/ExtraBul.gf | 4 ++-- src/bulgarian/ResBul.gf | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/bulgarian/CatBul.gf b/src/bulgarian/CatBul.gf index dd25c203e..39278ca4d 100644 --- a/src/bulgarian/CatBul.gf +++ b/src/bulgarian/CatBul.gf @@ -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} ; diff --git a/src/bulgarian/ConjunctionBul.gf b/src/bulgarian/ConjunctionBul.gf index 4c30c176e..93cb1f309 100644 --- a/src/bulgarian/ConjunctionBul.gf +++ b/src/bulgarian/ConjunctionBul.gf @@ -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} ; } diff --git a/src/bulgarian/ExtendBul.gf b/src/bulgarian/ExtendBul.gf index f5e0381af..f2abbb1b8 100644 --- a/src/bulgarian/ExtendBul.gf +++ b/src/bulgarian/ExtendBul.gf @@ -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} ; diff --git a/src/bulgarian/ExtraBul.gf b/src/bulgarian/ExtraBul.gf index f98398188..bcd3212d4 100644 --- a/src/bulgarian/ExtraBul.gf +++ b/src/bulgarian/ExtraBul.gf @@ -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} ; diff --git a/src/bulgarian/ResBul.gf b/src/bulgarian/ResBul.gf index cfe5416b9..580f2be91 100644 --- a/src/bulgarian/ResBul.gf +++ b/src/bulgarian/ResBul.gf @@ -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 ;