Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

This commit is contained in:
Krasimir Angelov
2024-06-05 12:48:51 +02:00
4 changed files with 13 additions and 4 deletions

View File

@@ -61,8 +61,10 @@ concrete IdiomFin of Idiom = CatFin **
ImpP3 np vp = ImpP3 np vp =
let vps = (sverb2verbSep vp.s).s ! ImperP3 (verbAgr np.a).n let vps = (sverb2verbSep vp.s).s ! ImperP3 (verbAgr np.a).n
in in
{s = np.s ! subjcase2npform vp.s.sc ++ vps ++ {s = vps ++
vp.s2 ! True ! Pos ! np.a ++ vp.adv ! Pos ++ vp.ext np.s ! subjcase2npform vp.s.sc ++
vp.s2 ! True ! Pos ! np.a ++
vp.adv ! Pos ++ vp.ext
} ; } ;
SelfAdvVP vp = insertAdv (\\_ => "itse") vp ; SelfAdvVP vp = insertAdv (\\_ => "itse") vp ;

View File

@@ -330,8 +330,8 @@ instance DiffFre of DiffRomance - [
<_, _, True> => <_, _, True> =>
neg.p1 ++ clit ++ fin ++ bindHyphen ++ subj ++ neg.p2 ++ inf ++ compl ++ ext ; neg.p1 ++ clit ++ fin ++ bindHyphen ++ subj ++ neg.p2 ++ inf ++ compl ++ ext ;
-- est loin la ville -- est Paris loin
_ => neg.p1 ++ clit ++ fin ++ neg.p2 ++ inf ++ compl ++ subj ++ ext _ => neg.p1 ++ clit ++ fin ++ neg.p2 ++ subj ++ inf ++ compl ++ ext
} ; } ;
bindHyphensT : Str = bindHyphen ++ "t" ++ bindHyphen ; bindHyphensT : Str = bindHyphen ++ "t" ++ bindHyphen ;

View File

@@ -55,5 +55,10 @@ concrete IdiomIta of Idiom = CatIta **
mkImperative False P1 vp ! RPos ! Masc ! Pl --- fem mkImperative False P1 vp ! RPos ! Masc ! Pl --- fem
} ; } ;
ImpP3 np vp = {
s = (mkClause (np.s ! Nom).comp np.hasClit False np.a vp).s
! DInv ! RPres ! Simul ! RPos ! Conjunct
} ;
} }

View File

@@ -54,6 +54,8 @@ concrete IdiomSwe of Idiom = CatSwe **
insertObj (\\a => "att" ++ infVP vp a) (predV (partV hålla_V "på")) ; insertObj (\\a => "att" ++ infVP vp a) (predV (partV hålla_V "på")) ;
ImpPl1 vp = {s = ["låt oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ; ImpPl1 vp = {s = ["låt oss"] ++ infVP vp {g = Utr ; n = Pl ; p = P1}} ;
ImpP3 np vp = {s = "låt" ++ np.s ! accusative ++ infVP vp {g = np.a.g ; n = np.a.n ; p = np.a.p}} ;
SelfAdvVP vp = insertObj (\\a => sjalv a.g a.n) vp ; SelfAdvVP vp = insertObj (\\a => sjalv a.g a.n) vp ;
SelfAdVVP vp = insertAdVAgr (\\a => sjalv a.g a.n) vp ; SelfAdVVP vp = insertAdVAgr (\\a => sjalv a.g a.n) vp ;