(Som) Remove Impers_Prep and put it in PrepCombination

This commit is contained in:
Inari Listenmaa
2019-07-25 18:41:16 +03:00
parent 8c8612b7d7
commit e5aa8a6499
3 changed files with 43 additions and 53 deletions
+2 -3
View File
@@ -141,7 +141,6 @@ param
| Sg2_Prep
| Pl1_Prep Inclusion
| Pl2_Prep
| Impers_Prep
| Reflexive_Prep
| P3_Prep ;
@@ -160,7 +159,6 @@ oper
agr2pagr : Agreement -> PrepAgr = \a -> case a of {
Sg1 => Sg1_Prep ;
Sg2 => Sg2_Prep ;
Impers => Impers_Prep ;
Pl1 i => Pl1_Prep i ;
Pl2 => Pl2_Prep ;
_ => P3_Prep
@@ -196,7 +194,7 @@ param
Preposition = U | Ku | Ka | La | NoPrep ;
PrepCombination = Ugu | Uga | Ula | Kaga | Kula | Kala
| Passive | Lagu | Laga -- TODO all combinations with impersonal la
| Passive | Lagu | Laga | Loo | Lala -- TODO all combinations with impersonal la
| Single Preposition ;
oper
@@ -206,6 +204,7 @@ oper
<True,NoPrep,NoPrep> => Passive ;
<True,Ku,NoPrep> => Lagu ;
<True,Ka,NoPrep> => Laga ;
<True,U,NoPrep> => Loo ;
<True,p,_> => Single p ; -- TODO all combinations
<False,_,_> => case <x,y> of {
<U,U|Ku> => Ugu ;