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

fix AdvVPSlash and PastPartAP

Browse Source
This commit is contained in:
Krasimir Angelov
2024-06-14 10:34:17 +02:00
parent 1fbec65714
commit d182354238
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/russian/ExtendRus.gf
View File

@@ -154,7 +154,10 @@ lin
++ vps.compl1 ! Pos ! a ++ vps.compl1 ! Pos ! a
++ vps.compl2 ! Pos ! a ++ vps.compl2 ! Pos ! a
++ vps.c.s ; -- ++ vps.c.s ; --
isPost = False ; isPost = case vps.isSimple of {
True => False ;
False => True
} ;
preferShort=PreferFull preferShort=PreferFull
} ; } ;

5
src/russian/ResRus.gf
View File

@@ -613,6 +613,7 @@ oper
compl1 : ComplTable ; compl1 : ComplTable ;
compl2 : ComplTable ; compl2 : ComplTable ;
c : ComplementCase ; c : ComplementCase ;
isSimple : Bool ; -- regulates the place of participle used as adjective
} ; ---- } ; ----
slashV : VerbForms -> ComplementCase -> VPSlash = \verb,c -> { slashV : VerbForms -> ComplementCase -> VPSlash = \verb,c -> {
@@ -622,6 +623,7 @@ oper
compl2 = \\_,a => [] ; compl2 = \\_,a => [] ;
dep = [] ; dep = [] ;
c = c ; c = c ;
isSimple = True
} ; } ;
insertSlashObjA : Adjective -> ComplementCase -> VPSlash -> VPSlash = \ap,c,slash -> { insertSlashObjA : Adjective -> ComplementCase -> VPSlash -> VPSlash = \ap,c,slash -> {
@@ -643,6 +645,7 @@ oper
} ; } ;
c = {s="" ; c=Acc ; neggen=True ; hasPrep=False}; c = {s="" ; c=Acc ; neggen=True ; hasPrep=False};
dep = slash.dep ; dep = slash.dep ;
isSimple = False
} ; } ;
insertSlashObj1 : (Polarity => Agr => Str) -> ComplementCase -> VPSlash -> VPSlash = \obj,c,slash -> { insertSlashObj1 : (Polarity => Agr => Str) -> ComplementCase -> VPSlash -> VPSlash = \obj,c,slash -> {
@@ -652,6 +655,7 @@ oper
compl2 = slash.compl2 ; compl2 = slash.compl2 ;
c = slash.c ; c = slash.c ;
dep = slash.dep ; dep = slash.dep ;
isSimple = False
} ; } ;
insertSlashObj2 : (Polarity => Agr => Str) -> ComplementCase -> VPSlash -> VPSlash = \obj,c,slash -> { insertSlashObj2 : (Polarity => Agr => Str) -> ComplementCase -> VPSlash -> VPSlash = \obj,c,slash -> {
@@ -661,6 +665,7 @@ oper
compl2 =\\p,a => slash.compl2 ! p ! a ++ obj ! p ! a; compl2 =\\p,a => slash.compl2 ! p ! a ++ obj ! p ! a;
c = slash.c ; c = slash.c ;
dep = slash.dep ; dep = slash.dep ;
isSimple = False
} ; } ;

4
src/russian/VerbRus.gf
View File

@@ -126,13 +126,13 @@ lin
AdVVP adv vp = vp ** {adv=\\a => adv.s ++ vp.adv ! a} ; AdVVP adv vp = vp ** {adv=\\a => adv.s ++ vp.adv ! a} ;
-- : VPSlash -> Adv -> VPSlash ; -- use (it) here -- : VPSlash -> Adv -> VPSlash ; -- use (it) here
AdvVPSlash vps adv = vps ** {compl=\\p,a => vps.compl ! p ! a ++ adv.s} ; AdvVPSlash vps adv = vps ** {compl1=\\p,a => vps.compl1 ! p ! a ++ adv.s; isSimple=False} ;
-- : AdV -> VPSlash -> VPSlash ; -- always use (it) -- : AdV -> VPSlash -> VPSlash ; -- always use (it)
AdVVPSlash adv vps = vps ** {adv=\\a=>adv.s ++ vps.adv ! a} ; AdVVPSlash adv vps = vps ** {adv=\\a=>adv.s ++ vps.adv ! a} ;
-- : VP -> Prep -> VPSlash ; -- live in (it) -- : VP -> Prep -> VPSlash ; -- live in (it)
VPSlashPrep vp prep = vp ** {c = prep ; compl1 = vp.compl ; compl2 = \\_,_ => []; dep=[]} ; VPSlashPrep vp prep = vp ** {c = prep ; compl1 = vp.compl ; compl2 = \\_,_ => []; dep=[]; isSimple=False} ;
-- : AP -> Comp ; -- (be) small -- : AP -> Comp ; -- (be) small
CompAP ap = case ap.preferShort of { CompAP ap = case ap.preferShort of {