mirror of
https://github.com/GrammaticalFramework/gf-core.git
synced 2026-05-18 23:52:51 -06:00
French structural words and VV
This commit is contained in:
@@ -17,6 +17,12 @@ resource CommonRomance = ParamRomance ** open Prelude in {
|
||||
Fem => bonne
|
||||
} ;
|
||||
|
||||
aagrForms : (x1,_,_,x4 : Str) -> (AAgr => Str) = \tout,toute,tous,toutes ->
|
||||
table {
|
||||
{g = g ; n = Sg} => genForms tout toute ! g ;
|
||||
{g = g ; n = Pl} => genForms tous toutes ! g
|
||||
} ;
|
||||
|
||||
Noun = {s : Number => Str ; g : Gender} ;
|
||||
|
||||
VP : Type = {
|
||||
@@ -44,7 +50,7 @@ resource CommonRomance = ParamRomance ** open Prelude in {
|
||||
VPAgrNone -- elle a dormi
|
||||
| VPAgrSubj -- elle est partie, elle s'est vue
|
||||
| VPAgrClit -- elle les a vues
|
||||
{g : Gender ; n : Number} ;
|
||||
{g : Gender ; n : Number} ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,8 @@ oper
|
||||
|
||||
conjThan : Str ;
|
||||
|
||||
clitInf : Str -> Str -> Str ;
|
||||
|
||||
-- These needed above.
|
||||
|
||||
param
|
||||
|
||||
@@ -145,6 +145,14 @@ oper
|
||||
subj ++ neg.p1 ++ clit ++ verb ++ neg.p2 ++ inf ++ compl
|
||||
} ;
|
||||
|
||||
infVP : VP -> Agr -> Str = \vp,agr ->
|
||||
let
|
||||
inf = (vp.s ! VPInfinit Simul).inf ! (aagr agr.g agr.n) ;
|
||||
neg = vp.neg ! Pos ; --- Neg not in API
|
||||
cli = vp.clit1 ! agr ++ vp.clit2 ;
|
||||
obj = vp.comp ! agr
|
||||
in
|
||||
clitInf cli inf ++ obj ;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -10,8 +10,9 @@ incomplete concrete VerbRomance of Verb =
|
||||
|
||||
ComplV3 v np np2 = insertObject v.c3 np2 (insertObject v.c2 np (predV v)) ;
|
||||
|
||||
ComplVV v vp = insertComplement (\\a => prepCase v.c2.c ++ infVP vp a) (predV v) ;
|
||||
|
||||
{-
|
||||
ComplVV v vp = insertObj (\\a => v.c2 ++ infVP vp a) (predV v) ;
|
||||
ComplVS v s = insertObj (\\_ => conjThat ++ s.s ! Sub) (predV v) ;
|
||||
ComplVQ v q = insertObj (\\_ => q.s ! QIndir) (predV v) ;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user