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

fix the aorist for the copula

Browse Source
This commit is contained in:
Krasimir Angelov
2018-06-10 07:15:25 +02:00
parent aa6ac1f8d3
commit 561bf721d1
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bulgarian/IdiomBul.gf
View File

@@ -33,7 +33,7 @@ concrete IdiomBul of Idiom = CatBul ** open Prelude, ParadigmsBul, ResBul in {
auxPres = auxBe ! VPres (numGenNum agr.gn) agr.p ; auxPres = auxBe ! VPres (numGenNum agr.gn) agr.p ;
auxAorist = auxBe ! VAorist (numGenNum agr.gn) agr.p ; auxAorist = auxBe ! VAorist (numGenNum agr.gn) agr.p ;
auxCondS = auxWould ! VAorist (numGenNum agr.gn) agr.p ; auxCondS = auxCond ! numGenNum agr.gn ! agr.p ;
v : {aux1:Str; aux2:Str; main:Str} v : {aux1:Str; aux2:Str; main:Str}
= case <t,a> of { = case <t,a> of {

30
src/bulgarian/ResBul.gf
View File

@@ -338,11 +338,11 @@ resource ResBul = ParamX ** open Prelude, Predef in {
VPres Pl P1 => "áúäåì" ; VPres Pl P1 => "áúäåì" ;
VPres Pl P2 => "áúäåòå" ; VPres Pl P2 => "áúäåòå" ;
VPres Pl P3 => "áúäàò" ; VPres Pl P3 => "áúäàò" ;
VAorist Sg P1 => "áèõ" ; VAorist Sg P1 => "áÿõ" ;
VAorist Sg _ => "áè" ; VAorist Sg _ => "áåøå" ;
VAorist Pl P1 => "áèõìå" ; VAorist Pl P1 => "áÿõìå" ;
VAorist Pl P2 => "áèõòå" ; VAorist Pl P2 => "áÿõòå" ;
VAorist Pl P3 => "áèõà" ; VAorist Pl P3 => "áÿõà" ;
VImperfect Sg P1 => "áúäåõ" ; VImperfect Sg P1 => "áúäåõ" ;
VImperfect Sg _ => "áúäåøå" ; VImperfect Sg _ => "áúäåøå" ;
VImperfect Pl P1 => "áúäåõìå" ; VImperfect Pl P1 => "áúäåõìå" ;
@@ -358,8 +358,20 @@ resource ResBul = ParamX ** open Prelude, Predef in {
VGerund => "áúäåéêè" VGerund => "áúäåéêè"
} ; } ;
verbBe : Verb = {s=\\_=>auxBe ; vtype=VNormal} ; auxCond : Number => Person => Str =
verbWould : Verb = {s=\\_=>auxWould ; vtype=VNormal} ; table {
Sg => table {
P1 => "áèõ" ;
_ => "áè"
} ;
Pl => table {
P1 => "áèõìå" ;
P2 => "áèõòå" ;
P3 => "áèõà"
}
} ;
verbBe : Verb = {s=table Aspect [auxBe; auxWould] ; vtype=VNormal} ;
reflClitics : Case => Str = table {Acc => "ñå"; Dat => "ñè"; WithPrep => with_Word ++ "ñåáå ñè"} ; reflClitics : Case => Str = table {Acc => "ñå"; Dat => "ñè"; WithPrep => with_Word ++ "ñåáå ñè"} ;
@@ -483,7 +495,7 @@ resource ResBul = ParamX ** open Prelude, Predef in {
auxPres = auxBe ! VPres (numGenNum clitic.agr.gn) clitic.agr.p ; auxPres = auxBe ! VPres (numGenNum clitic.agr.gn) clitic.agr.p ;
auxAorist = auxBe ! VAorist (numGenNum clitic.agr.gn) clitic.agr.p ; auxAorist = auxBe ! VAorist (numGenNum clitic.agr.gn) clitic.agr.p ;
auxCond = auxWould ! VAorist (numGenNum clitic.agr.gn) clitic.agr.p ; auxCondS = auxCond ! numGenNum clitic.agr.gn ! clitic.agr.p ;
apc : Str -> Str = \s -> apc : Str -> Str = \s ->
case <numGenNum clitic.agr.gn, clitic.agr.p> of { case <numGenNum clitic.agr.gn, clitic.agr.p> of {
@@ -533,7 +545,7 @@ resource ResBul = ParamX ** open Prelude, Predef in {
<Past,Anter> => {aux=vf4 auxAorist; main=perfect} ; --# notpresent <Past,Anter> => {aux=vf4 auxAorist; main=perfect} ; --# notpresent
<Fut, Simul> => {aux=vf3 clitic.s; main=present} ; --# notpresent <Fut, Simul> => {aux=vf3 clitic.s; main=present} ; --# notpresent
<Fut, Anter> => {aux=vf3 (apc []); main=perfect} ; --# notpresent <Fut, Anter> => {aux=vf3 (apc []); main=perfect} ; --# notpresent
<Cond,_ > => {aux=vf4 auxCond ; main=perfect} --# notpresent <Cond,_ > => {aux=vf4 auxCondS; main=perfect} --# notpresent
} }
in verb.ad.s ++ li0 ++ verbs.aux.s1 ++ verbs.main ++ verbs.aux.s2 ; in verb.ad.s ++ li0 ++ verbs.aux.s1 ++ verbs.main ++ verbs.aux.s2 ;