adjustments in Paradigms ; lang-specific modules for all except Rus, Ara

lib/resource-1.0/swedish/ParadigmsSwe.gf

@@ -59,7 +59,8 @@ oper
 
 -- Prepositions used in many-argument functions are just strings.
 
-  Preposition : Type = Str ;
+  mkPrep : Str -> Prep ;
+  noPrep : Prep ;         -- empty string
 
 --2 Nouns
 
@@ -100,7 +101,7 @@ oper
 -- 
 -- Relational nouns ("daughter of x") need a preposition. 
 
-  mkN2 : N -> Preposition -> N2 ;
+  mkN2 : N -> Prep -> N2 ;
 
 -- The most common preposition is "av", and the following is a
 -- shortcut for regular, $nonhuman$ relational nouns with "av".
@@ -112,7 +113,7 @@ oper
 --
 -- Three-place relational nouns ("the connection from x to y") need two prepositions.
 
-  mkN3 : N -> Preposition -> Preposition -> N3 ;
+  mkN3 : N -> Prep -> Prep -> N3 ;
 
 
 --3 Relational common noun phrases
@@ -127,7 +128,8 @@ oper
 --
 -- Proper names, with a regular genitive, are formed as follows
 
-  regPN : Str -> Gender -> PN ;          -- John, John's
+  regGenPN : Str -> Gender -> PN ;
+  regPN    : Str -> PN ;            -- utrum
 
 -- Sometimes you can reuse a common noun as a proper name, e.g. "Bank".
 
@@ -167,7 +169,7 @@ oper
 --
 -- Two-place adjectives need a preposition for their second argument.
 
-  mkA2 : A -> Preposition -> A2 ;
+  mkA2 : A -> Prep -> A2 ;
 
 
 --2 Adverbs
@@ -182,12 +184,6 @@ oper
 
   mkAdA : Str -> AdA ;
 
---2 Prepositions
---
--- A preposition is just a string.
-
-  mkPreposition : Str -> Preposition ;
-
 --2 Verbs
 --
 -- The worst case needs five forms.
@@ -234,7 +230,7 @@ oper
 -- Two-place verbs need a preposition, except the special case with direct object.
 -- (transitive verbs). Notice that a particle comes from the $V$.
 
-  mkV2  : V -> Preposition -> V2 ;
+  mkV2  : V -> Prep -> V2 ;
 
   dirV2 : V -> V2 ;
 
@@ -243,8 +239,8 @@ oper
 -- Three-place (ditransitive) verbs need two prepositions, of which
 -- the first one or both can be absent.
 
-  mkV3     : V -> Preposition -> Preposition -> V3 ; -- tala med om
-  dirV3    : V -> Preposition -> V3 ;                -- ge _ till
+  mkV3     : V -> Prep -> Prep -> V3 ; -- tala med om
+  dirV3    : V -> Prep -> V3 ;                -- ge _ till
   dirdirV3 : V -> V3 ;                               -- ge _ _
 
 --3 Other complement patterns
@@ -254,18 +250,18 @@ oper
 
   mkV0  : V -> V0 ;
   mkVS  : V -> VS ;
-  mkV2S : V -> Str -> V2S ;
+  mkV2S : V -> Prep -> V2S ;
   mkVV  : V -> VV ;
-  mkV2V : V -> Str -> Str -> V2V ;
+  mkV2V : V -> Prep -> Prep -> V2V ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Str -> V2A ;
+  mkV2A : V -> Prep -> V2A ;
   mkVQ  : V -> VQ ;
-  mkV2Q : V -> Str -> V2Q ;
+  mkV2Q : V -> Prep -> V2Q ;
 
   mkAS  : A -> AS ;
-  mkA2S : A -> Str -> A2S ;
+  mkA2S : A -> Prep -> A2S ;
   mkAV  : A -> AV ;
-  mkA2V : A -> Str -> A2V ;
+  mkA2V : A -> Prep -> A2V ;
 
 -- Notice: categories $V2S, V2V, V2A, V2Q$ are in v 1.0 treated
 -- just as synonyms of $V2$, and the second argument is given
@@ -292,6 +288,9 @@ oper
   nominative = Nom ;
   genitive = Gen ;
 
+  mkPrep p = {s = p ; lock_Prep = <>} ;
+  noPrep = mkPrep [] ;
+
   mkN = \apa,apan,apor,aporna ->  {
     s = nounForms apa apan apor aporna ;
     g = case last apan of {
@@ -381,11 +380,12 @@ oper
       } ;
 
 
-  mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p} ;
-  regN2 n g = mkN2 (regGenN n g) (mkPreposition "av") ;
-  mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p ; c3 = q} ;
+  mkN2 = \n,p -> n ** {lock_N2 = <> ; c2 = p.s} ;
+  regN2 n g = mkN2 (regGenN n g) (mkPrep "av") ;
+  mkN3 = \n,p,q -> n ** {lock_N3 = <> ; c2 = p.s ; c3 = q.s} ;
 
-  regPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
+  regPN n = regGenPN n utrum ;
+  regGenPN n g = {s = \\c => mkCase c n ; g = g} ** {lock_PN = <>} ;
   nounPN n = {s = n.s ! singular ! Indef ; g = n.g ; lock_PN = <>} ;
   mkNP x y n g = 
     {s = table {NPPoss _ => y ; _ => x} ; a = agrP3 g n ; p = P3 ;
@@ -413,14 +413,12 @@ oper
 
   compoundA adj = {s = adj.s ; isComp = True ; lock_A = <>} ;
 
-  mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ;
+  mkA2 a p = a ** {c2 = p.s ; lock_A2 = <>} ;
 
   mkAdv x = ss x ** {lock_Adv = <>} ;
   mkAdV x = ss x ** {lock_AdV = <>} ;
   mkAdA x = ss x ** {lock_AdA = <>} ;
 
-  mkPreposition p = p ;
-
   mkV = \finna,finner,finn,fann,funnit,funnen ->
     let 
       funn = ptPretForms funnen ;
@@ -489,12 +487,12 @@ oper
   depV v = {s = v.s ; part = v.part ; vtype = VPass ; lock_V = <>} ;
   reflV v = {s = v.s ; part = v.part ; vtype = VRefl ; lock_V = <>} ;
 
-  mkV2 v p = v ** {c2 = p ; lock_V2 = <>} ;
-  dirV2 v = mkV2 v [] ;
+  mkV2 v p = v ** {c2 = p.s ; lock_V2 = <>} ;
+  dirV2 v = mkV2 v noPrep ;
 
-  mkV3 v p q = v ** {c2 = p ; c3 = q ; lock_V3 = <>} ;
-  dirV3 v p = mkV3 v [] p ;
-  dirdirV3 v = dirV3 v [] ;
+  mkV3 v p q = v ** {c2 = p.s ; c3 = q.s ; lock_V3 = <>} ;
+  dirV3 v p = mkV3 v noPrep p ;
+  dirdirV3 v = dirV3 v noPrep ;
 
   mkV0  v = v ** {lock_V0 = <>} ;
   mkVS  v = v ** {lock_VS = <>} ;