1
0
forked from GitHub/gf-core

some more fixes for cleaner compilation of alltensenses

This commit is contained in:
aarne
2009-06-22 14:45:02 +00:00
parent f8fdaa7acc
commit ff29836c9b
3 changed files with 21 additions and 18 deletions

View File

@@ -4929,17 +4929,17 @@ let s_ = Predef.tk 4 seure in
VP (Impf Ind Pl P3) => s_ + "eien" ;--# notpresent
VP (Impf Ind Sg P3) => s_ + "eia" ;--# notpresent
VP (Impf Sub Pl P1) => s_ + "eguérem" ;--# notpresent
VP (Impf Sub Pl P1) => s_ + "eguéssim" ;--# notpresent
-- VP (Impf Sub Pl P1) => s_ + "eguéssim" ;--# notpresent
VP (Impf Sub Sg P1) => s_ + "eguera" ;--# notpresent
VP (Impf Sub Sg P1) => s_ + "egués" ;--# notpresent
-- VP (Impf Sub Sg P1) => s_ + "egués" ;--# notpresent
VP (Impf Sub Pl P2) => s_ + "eguéreu" ;--# notpresent
VP (Impf Sub Pl P2) => s_ + "eguéssiu" ;--# notpresent
-- VP (Impf Sub Pl P2) => s_ + "eguéssiu" ;--# notpresent
VP (Impf Sub Sg P2) => s_ + "egueres" ;--# notpresent
VP (Impf Sub Sg P2) => s_ + "eguessis" ;--# notpresent
-- VP (Impf Sub Sg P2) => s_ + "eguessis" ;--# notpresent
VP (Impf Sub Pl P3) => s_ + "egueren" ;--# notpresent
VP (Impf Sub Pl P3) => s_ + "eguessin" ;--# notpresent
-- VP (Impf Sub Pl P3) => s_ + "eguessin" ;--# notpresent
VP (Impf Sub Sg P3) => s_ + "eguera" ;--# notpresent
VP (Impf Sub Sg P3) => s_ + "egués" ;--# notpresent
-- VP (Impf Sub Sg P3) => s_ + "egués" ;--# notpresent
VP (Pret Pl P1) => s_ + "eguérem" ;--# notpresent
VP (Pret Sg P1) => s_ + "eguí" ;--# notpresent
VP (Pret Pl P2) => s_ + "eguéreu" ;--# notpresent
@@ -4971,8 +4971,8 @@ let s_ = Predef.tk 4 seure in
VP (Pass Sg Masc) => s_ + "egut" ;
VP (Impf Ind Pl P1) => s_ + "èiem" ;--# notpresent
VP (Impf Ind Pl P2) => s_ + "èieu" ;--# notpresent
VP (Impf Ind Pl P1) => s_ + "éiem" ;--# notpresent
VP (Impf Ind Pl P2) => s_ + "éieu" ;--# notpresent
-- VP (Impf Ind Pl P1) => s_ + "éiem" ;--# notpresent
-- VP (Impf Ind Pl P2) => s_ + "éieu" ;--# notpresent
VP (Imp Sg P1) => variants {}
}
} ;
@@ -5369,17 +5369,17 @@ let t_ = Predef.tk 5 t
VP (Impf Ind Pl P3) => t_ + "orcien" ;--# notpresent
VP (Impf Ind Sg P3) => t_ + "orcia" ;--# notpresent
VP (Impf Sub Pl P1) => t_ + "orcérem" ;--# notpresent
VP (Impf Sub Pl P1) => t_ + "orcéssim" ;--# notpresent
-- VP (Impf Sub Pl P1) => t_ + "orcéssim" ;--# notpresent
VP (Impf Sub Sg P1) => t_ + "orcera" ;--# notpresent
VP (Impf Sub Sg P1) => t_ + "orcés" ;--# notpresent
-- VP (Impf Sub Sg P1) => t_ + "orcés" ;--# notpresent
VP (Impf Sub Pl P2) => t_ + "orcéreu" ;--# notpresent
VP (Impf Sub Pl P2) => t_ + "orcéssiu" ;--# notpresent
-- VP (Impf Sub Pl P2) => t_ + "orcéssiu" ;--# notpresent
VP (Impf Sub Sg P2) => t_ + "orceres" ;--# notpresent
VP (Impf Sub Sg P2) => t_ + "orcessis" ;--# notpresent
-- VP (Impf Sub Sg P2) => t_ + "orcessis" ;--# notpresent
VP (Impf Sub Pl P3) => t_ + "orceren" ;--# notpresent
VP (Impf Sub Pl P3) => t_ + "orcessin" ;--# notpresent
-- VP (Impf Sub Pl P3) => t_ + "orcessin" ;--# notpresent
VP (Impf Sub Sg P3) => t_ + "orcera" ;--# notpresent
VP (Impf Sub Sg P3) => t_ + "orcés" ;--# notpresent
-- VP (Impf Sub Sg P3) => t_ + "orcés" ;--# notpresent
VP (Pret Pl P1) => t_ + "orcérem" ;--# notpresent
VP (Pret Sg P1) => t_ + "orcí" ;--# notpresent
VP (Pret Pl P2) => t_ + "orcéreu" ;--# notpresent

View File

@@ -143,10 +143,12 @@ resource ResGer = ParamX ** open Prelude in {
vFin : Bool -> Mood -> Tense -> Agr -> VForm = \b,m,t,a ->
case <t,m> of {
<Past,MIndic> => VFin b (VImpfInd a.n a.p) ; --# notpresent
<Past,MConjunct> => VFin b (VImpfSubj a.n a.p) ; --# notpresent
<Pres,MIndic> => VFin b (VPresInd a.n a.p) ;
<Pres,MConjunct> => VFin b (VPresSubj a.n a.p)
; --# notpresent
<Past,MIndic> => VFin b (VImpfInd a.n a.p) ; --# notpresent
<Past,MConjunct> => VFin b (VImpfSubj a.n a.p) ; --# notpresent
_ => VInf False --# notpresent
} ;
conjAgr : Agr -> Agr -> Agr = \a,b -> {

View File

@@ -102,8 +102,9 @@ oper
vFin : Tense -> Voice -> VForm = \t,v -> case t of {
Pres => VF (VPres v)
; --# notpresent
Past => VF (VPret v) --# notpresent
; --# notpresent
Past => VF (VPret v) ; --# notpresent
_ => VI (VInfin v) --# notpresent
} ;
-- Used in $ConjunctionScand$.