fixes in French morpho quiz grammar

This commit is contained in:
aarne
2010-09-28 16:52:48 +00:00
parent 31d0e84617
commit d85c491451
3 changed files with 5 additions and 4 deletions

View File

@@ -12,7 +12,7 @@ cat
TMood ; Number ; Person ; NumPersI ; Gender ; Mood ; TMood ; Number ; Person ; NumPersI ; Gender ; Mood ;
fun fun
DAll : Word -> Display ; -- DAll : Word -> Display ;
DForm : Word -> Form -> Display ; DForm : Word -> Form -> Display ;
VInfin : Form ; VInfin : Form ;

View File

@@ -9,13 +9,13 @@ lincat
TMood, Number, Person, NumPersI, Gender, Mood = Str ; TMood, Number, Person, NumPersI, Gender, Mood = Str ;
lin lin
DAll w = w ++ ":" ++ "la conjugaison" ; -- DAll w = w ++ ":" ++ "la conjugaison" ;
DForm w f = w ++ ":" ++ f ; DForm w f = w ++ ":" ++ f ;
VInfin = "infinitif" ; VInfin = "infinitif" ;
VFin m n p = m ++ n ++ p ; VFin m n p = m ++ n ++ p ;
VImper np = "imparfait" ++ np ; VImper np = "impératif" ++ np ;
VPart g n = "participe passé" ++ g ++ n ; VPart g n = "participe passé" ++ g ++ n ;
VGer = "participe présent" ; VGer = "participe présent" ;

View File

@@ -16,6 +16,7 @@ lincat
lin lin
-- display the same subset of forms as Petit Robert -- display the same subset of forms as Petit Robert
{-
DAll w = DAll w =
w ! R.VInfin True ++ w ! R.VInfin True ++
w ! R.VFin (R.VPres R.Indic) R.Sg R.P1 ++ w ! R.VFin (R.VPres R.Indic) R.Sg R.P1 ++
@@ -33,7 +34,7 @@ lin
w ! R.VImper R.PlP1 ++ w ! R.VImper R.PlP1 ++
w ! R.VGer ++ w ! R.VGer ++
w ! R.VPart R.Masc R.Sg ; w ! R.VPart R.Masc R.Sg ;
-}
DForm w f = w ! f.v ++ f.s ; --- DForm w f = w ! f.v ++ f.s ; ---
VInfin = {s = [] ; v = R.VInfin True} ; VInfin = {s = [] ; v = R.VInfin True} ;