msyds/gf-rgl
1
0
Fork 0
forked from GitHub/gf-rgl
Code Pull Requests Activity

use CPrep instead of Acc in several places

Browse Source
This commit is contained in:
Krasimir Angelov
2018-07-04 14:06:41 +02:00
parent 237a68f05e
commit fa966ab212
7 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bulgarian/AdjectiveBul.gf
View File

@@ -10,8 +10,8 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
} ;
ComparA a np = {
s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ++ "îò" ++ np.s ! RObj Acc ;
adv = "ïî" ++ hyphen ++ a.adv ++ "îò" ++ np.s ! RObj Acc ;
s = \\aform,_ => "ïî" ++ hyphen ++ a.s ! aform ++ "îò" ++ np.s ! RObj CPrep ;
adv = "ïî" ++ hyphen ++ a.adv ++ "îò" ++ np.s ! RObj CPrep ;
isPre = True
} ;
UseComparA a = {
@@ -28,16 +28,15 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in {
-- $SuperlA$ belongs to determiner syntax in $Noun$.
---- just to make the API compile. AR 7/4/2010
CAdvAP ad ap np = {
s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.sn ++ np.s ! RObj Acc ;
adv = ad.s ++ ap.adv ++ ad.sn ++ np.s ! RObj Acc ;
s = \\a,p => ad.s ++ ap.s ! a ! p ++ ad.sn ++ np.s ! RObj CPrep ;
adv = ad.s ++ ap.adv ++ ad.sn ++ np.s ! RObj CPrep ;
isPre = False
} ;
ComplA2 a np = {
s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj Acc ;
adv = a.adv ++ a.c2 ++ np.s ! RObj Acc ;
s = \\aform,p => a.s ! aform ++ a.c2 ++ np.s ! RObj CPrep ;
adv = a.adv ++ a.c2 ++ np.s ! RObj CPrep ;
isPre = False
} ;

2
src/bulgarian/AdverbBul.gf
View File

@@ -5,7 +5,7 @@ concrete AdverbBul of Adverb = CatBul ** open ResBul, Prelude in {
lin
PositAdvAdj a = {s = a.adv} ;
ComparAdvAdj cadv a np = {
s = cadv.s ++ "ïî" ++ "-" ++ a.s ! ASg Neut Indef ++ "îò" ++ np.s ! RObj Acc
s = cadv.s ++ "ïî" ++ "-" ++ a.s ! ASg Neut Indef ++ "îò" ++ np.s ! RObj CPrep
} ;
ComparAdvAdjS cadv a s = {
s = cadv.s ++ "ïî" ++ "-" ++ a.s ! ASg Neut Indef ++ "îò" ++ "êîëêîòî" ++ s.s

7
src/bulgarian/ExtendBul.gf
View File

@@ -7,8 +7,7 @@ lin
AdAdV a adv = {s = a.s ++ adv.s; p = adv.p} ;
EmptyRelSlash slash = {
s = \\t,a,p,agr => slash.c2.s ++ whichRP ! agr.gn ++ slash.s ! agr ! t ! a ! p ! Main ;
role = RObj Acc
s = \\t,a,p,agr => slash.c2.s ++ whichRP ! agr.gn ++ slash.s ! agr ! t ! a ! p ! Main
} ;
CompoundN n1 n2 =
@@ -55,7 +54,7 @@ lin
vp.s ! Perf ! VPassive aform ++
vp.compl1 ! {gn=aform2gennum aform; p=p} ++
vp.compl2 ! {gn=aform2gennum aform; p=p} ++
"от" ++ np.s ! RObj Acc
"от" ++ np.s ! RObj CPrep
in {s = ap; adv = ap ! ASg Neut Indef ! P3; isPre = False} ;
GerundCN vp = {
@@ -93,7 +92,7 @@ lin
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe) ;
PassAgentVPSlash vp np =
insertObj (\\_ => "от" ++ np.s ! RObj Acc) Pos
insertObj (\\_ => "от" ++ np.s ! RObj CPrep) Pos
(insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe)) ;

5
src/bulgarian/ExtraBul.gf
View File

@@ -27,8 +27,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
} ;
EmptyRelSlash slash = {
s = \\t,a,p,agr => slash.c2.s ++ whichRP ! agr.gn ++ slash.s ! agr ! t ! a ! p ! Main ;
role = RObj Acc
s = \\t,a,p,agr => slash.c2.s ++ whichRP ! agr.gn ++ slash.s ! agr ! t ! a ! p ! Main
} ;
i8fem_Pron = mkPron "àç" "ìîé" "ìîÿ" "ìîÿò" "ìîÿ" "ìîÿòà" "ìîå" "ìîåòî" "ìîè" "ìîèòå" (GSg Fem) PronP1 ;
@@ -96,7 +95,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul **
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe) ;
PassAgentVPSlash vp np = ---- AR 9/4/2014: to be verified
insertObj (\\_ => "÷ðåç" ++ np.s ! RObj Acc) Pos
insertObj (\\_ => "÷ðåç" ++ np.s ! RObj CPrep) Pos
(insertObj (\\a => vp.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc)) ++
vp.compl1 ! a ++ vp.compl2 ! a) Pos (predV verbBe)) ;

4
src/bulgarian/NounBul.gf
View File

@@ -197,9 +197,9 @@ concrete NounBul of Noun = CatBul ** open ResBul, Prelude in {
ApposCN cn np = {s = \\nf => cn.s ! nf ++ np.s ! RSubj; g=cn.g} ;
PossNP cn np = {s = \\nf => cn.s ! nf ++ "íà" ++ np.s ! (RObj Acc); g = cn.g} ;
PossNP cn np = {s = \\nf => cn.s ! nf ++ "íà" ++ np.s ! (RObj CPrep); g = cn.g} ;
PartNP cn np = {s = \\nf => cn.s ! nf ++ "îò" ++ np.s ! (RObj Acc); g = cn.g} ;
PartNP cn np = {s = \\nf => cn.s ! nf ++ "îò" ++ np.s ! (RObj CPrep); g = cn.g} ;
CountNP det np = {
s = \\role => let g = case np.gn of { -- this is lossy

2
src/bulgarian/RelativeBul.gf
View File

@@ -28,7 +28,7 @@ concrete RelativeBul of Relative = CatBul ** open ResBul in {
} ;
FunRP p np rp = {
s = \\gn => np.s ! RObj Acc ++ linPrep p ++ rp.s ! gn ;
s = \\gn => np.s ! RObj CPrep ++ linPrep p ++ rp.s ! gn ;
} ;
IdRP = {

2
src/bulgarian/VerbBul.gf
View File

@@ -150,7 +150,7 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in {
PassV2 v = insertObj (\\a => v.s ! Perf ! VPassive (aform a.gn Indef (RObj Acc))) Pos (predV verbBe) ;
CompAP ap = {s = \\agr => ap.s ! aform agr.gn Indef (RObj Acc) ! agr.p; p = Pos} ;
CompNP np = {s = \\_ => np.s ! RObj Acc; p = personPol np.p} ;
CompNP np = {s = \\_ => np.s ! RObj CPrep; p = personPol np.p} ;
CompAdv a = {s = \\_ => a.s; p = Pos} ;
CompCN cn = {s = \\agr => cn.s ! (NF (numGenNum agr.gn) Indef); p = Pos} ;