use consistent lin X everywhere

src/malay/ParadigmsMay.gf

@@ -10,6 +10,22 @@ oper
 -- defined in $ResSom$.
 
   noPrep : Prep = mkPrep "" ;
+  emptyPrep : Prep = lin Prep {
+    s = [] ;
+    obj = \\_ => [] ;
+    prepType = EmptyPrep ;
+    } ;
+  datPrep : Prep = mkPrep "kepada" ;
+
+  -- direct object: "hits him" -> "memukul+nya"
+  dirPrep : Prep = lin Prep {
+    s = [] ;
+    obj = table {
+      P1 => BIND ++ "ku" ;
+      P2 => BIND ++ "mu" ;
+      P3 => BIND ++ "nya" } ;
+    prepType = DirObj ;
+    } ;
 
 --2 Nouns
 
@@ -192,9 +208,16 @@ oper
 
   mkV2S = overload {
     mkV2S : Str -> V2S = \v -> lin V2S (mkVerb2 (regVerb v Meng) dirPrep) ;
-    mkV2S : V -> Prep -> V2S = \v,p -> lin V22 (mkVerb2 v p)
+    mkV2S : V -> Prep -> V2S = \v,p -> lin V2S (mkVerb2 v p)
   } ;
 
+
+  mkPrep : Str -> Prep = \dengan -> lin Prep {
+    s = dengan ;
+    obj = \\p => dengan + poss2str (Poss p) ;
+    prepType = OtherPrep ;
+    } ;
+
 --   lin like_V2 = let like' : V2 = mkV2 "suka" in like' ** {
 --   s = table {Passive => "disukai" ; _ => "suka"} ;
 -- } ;

src/malay/ResMay.gf

@@ -167,31 +167,6 @@ oper
     prepType : PrepType ; -- TODO rename, the name is confusing
     } ;
 
-  mkPrep : Str -> Preposition = \dengan -> {
-    s = dengan ;
-    obj = \\p => dengan + poss2str (Poss p) ;
-    prepType = OtherPrep ;
-    } ;
-
-  -- direct object: "hits him" -> "memukul+nya"
-  dirPrep : Preposition = {
-    s = [] ;
-    obj = table {
-      P1 => BIND ++ "ku" ;
-      P2 => BIND ++ "mu" ;
-      P3 => BIND ++ "nya" } ;
-    prepType = DirObj ;
-    } ;
-
-  -- truly empty
-  emptyPrep : Preposition = {
-    s = [] ;
-    obj = \\_ => [] ;
-    prepType = EmptyPrep ;
-    } ;
-
-  datPrep : Preposition = mkPrep "kepada" ;
-
   applyPrep : Preposition -> NounPhrase -> Str = \prep,np ->
     case <np.a, prep.prepType> of {
       <IsPron p,OtherPrep> => prep.obj ! p ++ np.empty ;