From 1fbec657141ef6c080261c2ea9e65234c76f3d1d Mon Sep 17 00:00:00 2001 From: Krasimir Angelov Date: Wed, 5 Jun 2024 12:49:54 +0200 Subject: [PATCH] PastPartAP, PastPartAgentAP in French --- src/french/ExtendFre.gf | 12 +++++++++++- src/romance/ExtendRomanceFunctor.gf | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/french/ExtendFre.gf b/src/french/ExtendFre.gf index bc4e1827d..2260b3ee3 100644 --- a/src/french/ExtendFre.gf +++ b/src/french/ExtendFre.gf @@ -6,7 +6,7 @@ concrete ExtendFre of Extend = ---- iFem_Pron, youFem_Pron, weFem_Pron, youPlFem_Pron, theyFem_Pron, youPolFem_Pron, youPolPl_Pron, youPolPlFem_Pron, GenRP, ExistCN, ExistMassCN, ExistPluralCN, RNP, ReflRNP, - PassVPSlash, PassAgentVPSlash, ApposNP, CompoundN, + PassVPSlash, PassAgentVPSlash, PastPartAP, PastPartAgentAP, ApposNP, CompoundN, BaseVPS, ConsVPS, PredVPS, MkVPS, ConjVPS ] -- put the names of your own definitions here with @@ -58,6 +58,9 @@ lin PassVPSlash vps = passVPSlash vps [] ; PassAgentVPSlash vps np = passVPSlash vps (let by = in by.s ++ (np.s ! by.c).ton) ; + PastPartAP vps = pastPartAP vps [] ; + PastPartAgentAP vps np = pastPartAP vps (let by = in by.s ++ (np.s ! by.c).ton) ; + ReflRNP v rnp = -- VPSlash -> RNP -> VP ; -- love my family and myself case v.c2.isDir of { True => insertRefl v ; @@ -79,6 +82,13 @@ oper comp = \\a => (let agr = complAgr a in vps.s.s ! VPart agr.g agr.n) ++ vps.comp ! a ++ agent ; } ; + pastPartAP : VPSlash -> Str -> AP ; + pastPartAP vps agent = lin AP { + s = \\af => vps.s.s ! VPart (aform2gender af) (aform2number af) ++ vps.comp ! (aform2aagr af ** {p = P3}) ++ agent ; + isPre = False ; + copTyp = serCopula + } ; + lin ApposNP np1 np2 = np1 ** { -- guessed by KA s = \\c => np1.s ! c ** {ton =(np1.s ! c).ton ++ "," ++ (np2.s ! Nom).ton; comp =(np1.s ! c).comp ++ "," ++ (np2.s ! Nom).comp diff --git a/src/romance/ExtendRomanceFunctor.gf b/src/romance/ExtendRomanceFunctor.gf index 257780709..8c4022b34 100644 --- a/src/romance/ExtendRomanceFunctor.gf +++ b/src/romance/ExtendRomanceFunctor.gf @@ -319,7 +319,7 @@ incomplete concrete ExtendRomanceFunctor of Extend = pastPartAP : VPSlash -> Str -> AP ; pastPartAP vps agent = lin AP { - s = \\af => vps.comp ! (aform2aagr af ** {p = P3}) ++ vps.s.s ! VPart (aform2gender af) (aform2number af) ++ agent ; + s = \\af => vps.s.s ! VPart (aform2gender af) (aform2number af) ++ vps.comp ! (aform2aagr af ** {p = P3}) ++ agent ; isPre = False ; copTyp = serCopula } ;