Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/french/DiffFre.gf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

instance DiffFre of DiffRomance - [
imperClit,
insertAdV,
invertedClause,
verbHyphen,
iAdvQuestionInv
Expand Down Expand Up @@ -314,4 +315,12 @@ instance DiffFre of DiffRomance - [

verbHyphen : Verb -> Str = \v -> v.s ! (VInfin True) ; --- kluge: use this field to store - or -t-

insertAdV : Str -> VP -> VP ;
insertAdV co vp = vp ** {
neg = \\b => let vpn = vp.neg ! b
-- hacky: the AdV is directly attached to the verb, so we put it
-- in the neg field
in {p1 = vpn.p1 ; p2 = vpn.p2 ++ co}
} ;

}
8 changes: 8 additions & 0 deletions src/romance/DiffRomance.gf
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,12 @@ oper
<RPres,Simul> => <verb ! VFin (VPres m) n p, []>
} ;

insertAdV : Str -> VP -> VP ;
insertAdV co vp = vp ** {
neg = \\b => let vpn = vp.neg ! b
-- hacky: the AdV is directly attached to the verb, so we put it
-- in the neg field
in {p1 = co ++ vpn.p1 ; p2 = vpn.p2}
} ;

} ;
6 changes: 0 additions & 6 deletions src/romance/ResRomance.gf
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,6 @@ oper
comp = \\a => vp.comp ! a ++ co ;
} ;

insertAdV : Str -> VP -> VP ;
insertAdV co vp = vp ** {
neg = \\b => let vpn = vp.neg ! b
in {p1 = vpn.p1 ; p2 = vpn.p2 ++ co}
} ;

insertClit3 : Str -> VP -> VP = \co,vp -> {
s = vp.s ;
agr = vp.agr ;
Expand Down