diff options
| author | aarne <aarne@chalmers.se> | 2010-09-28 16:52:48 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2010-09-28 16:52:48 +0000 |
| commit | 8fa5a507283c6d4bb12911202f551faa506c68aa (patch) | |
| tree | 4908d08d01ad0a9e930840ca7bcb0621d05af4ad /examples | |
| parent | 66672d8af16fb1d3f69727a3cb316d2d87617851 (diff) | |
fixes in French morpho quiz grammar
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/morpho/Fre.gf | 2 | ||||
| -rw-r--r-- | examples/morpho/FreDescr.gf | 4 | ||||
| -rw-r--r-- | examples/morpho/FreReal.gf | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/examples/morpho/Fre.gf b/examples/morpho/Fre.gf index 54ebaf4d0..c27825163 100644 --- a/examples/morpho/Fre.gf +++ b/examples/morpho/Fre.gf @@ -12,7 +12,7 @@ cat TMood ; Number ; Person ; NumPersI ; Gender ; Mood ; fun - DAll : Word -> Display ; +-- DAll : Word -> Display ; DForm : Word -> Form -> Display ; VInfin : Form ; diff --git a/examples/morpho/FreDescr.gf b/examples/morpho/FreDescr.gf index 0007986b2..dc6c8c67f 100644 --- a/examples/morpho/FreDescr.gf +++ b/examples/morpho/FreDescr.gf @@ -9,13 +9,13 @@ lincat TMood, Number, Person, NumPersI, Gender, Mood = Str ; lin - DAll w = w ++ ":" ++ "la conjugaison" ; +-- DAll w = w ++ ":" ++ "la conjugaison" ; DForm w f = w ++ ":" ++ f ; VInfin = "infinitif" ; VFin m n p = m ++ n ++ p ; - VImper np = "imparfait" ++ np ; + VImper np = "impératif" ++ np ; VPart g n = "participe passé" ++ g ++ n ; VGer = "participe présent" ; diff --git a/examples/morpho/FreReal.gf b/examples/morpho/FreReal.gf index c9dfcc84d..86a56c164 100644 --- a/examples/morpho/FreReal.gf +++ b/examples/morpho/FreReal.gf @@ -16,6 +16,7 @@ lincat lin -- display the same subset of forms as Petit Robert +{- DAll w = w ! R.VInfin True ++ w ! R.VFin (R.VPres R.Indic) R.Sg R.P1 ++ @@ -33,7 +34,7 @@ lin w ! R.VImper R.PlP1 ++ w ! R.VGer ++ w ! R.VPart R.Masc R.Sg ; - +-} DForm w f = w ! f.v ++ f.s ; --- VInfin = {s = [] ; v = R.VInfin True} ; |