(Som) Add VPSlashPrep + fix bug in insertAdv

src/somali/ParamSom.gf

@@ -261,6 +261,15 @@ oper
           Single _ => oneWay ! p1 ! p2 ;
           z        => z } ;
 
+  combinePassive : Preposition -> PrepCombination = \p ->
+    case p of {
+      U => Loo ;
+      Ku => Lagu ;
+      Ka => Laga ;
+      La => Lala ;
+      _ => Passive
+    } ;
+
   isPassive : {c2 : PrepCombination} -> Bool = \vp ->
     case vp.c2 of {
       Passive | Lagu | Laga | Loo | Lala => True ;

src/somali/ResSom.gf

@@ -769,11 +769,7 @@ oper
 
   passVP : VerbPhrase -> VerbPhrase = \vp -> vp ** {
     c2 = case vp.c2 of {
-      Single NoPrep => Passive ;
+      Single p => combinePassive p ;
-      Single Ku     => Lagu ;
-      Single Ka     => Laga ;
-      Single U      => Loo ;
-      Single La     => Lala ;
       _             => vp.c2 }
     } ;
 
@@ -827,6 +823,7 @@ oper
              -- if free complement slots, introduce adv.np with insertComp
              Single NoPrep => insertCompLite (vp ** {c2 = Single adv.c2}) adv.np ** adv' ;
              Single p => insertCompLite (vp ** {c2 = combine p adv.c2}) adv.np ** adv' ;
+             Passive => insertCompLite (vp ** {c2 = combinePassive adv.c2}) adv.np ** adv' ;
 
              -- if complement slots are full, just insert strings.
              _ => vp ** adv''

src/somali/VerbSom.gf

@@ -121,10 +121,9 @@ lin
   AdVVPSlash adv vps = vps ** { adv = adv.s ++ vps.adv } ;
 -}
   -- : VP -> Prep -> VPSlash ;  -- live in (it)
-  -- NB. We need possibly a MissingArg kind of solution here too
+  VPSlashPrep vp prep =
-  -- VPSlashPrep vp prep = vp **
+    let adv = prepNP prep emptyNP
-  --   { c2 = case vp.c2 of { NoPrep => prep.prep ;
+     in insertAdv vp adv ;
-  --                          x      => x }} ;