fixed naming conflicts in resource

lib/resource-1.0/catalan/DiffCat.gf

@@ -5,7 +5,7 @@ instance DiffCat of DiffRomance = open CommonRomance, PhonoCat, BeschCat, Prelud
   flags optimize=noexpand ;
 
   param 
-    Prep = P_de | P_a ;
+    Prepos = P_de | P_a ;
     VType = VHabere | VRefl ;
 
 oper

lib/resource-1.0/catalan/LexiconCat.gf

@@ -1,7 +1,7 @@
 --# -path=.:../romance:../common:../abstract:../../prelude
 
 concrete LexiconCat of Lexicon = CatCat ** open 
-  MorphoCat, ParadigmsCat, BeschCat in {
+  (M=MorphoCat), ParadigmsCat, BeschCat in {
 
 flags 
   optimize=values ;

lib/resource-1.0/catalan/StructuralCat.gf

@@ -149,7 +149,7 @@ lin
       Fem Pl P2 ;
 
 oper
-  etConj : {s : Str ; n : Number} = {s = "i" } ** {n = Pl} ;
+  etConj : {s : Str ; n : MorphoCat.Number} = {s = "i" } ** {n = Pl} ;
 
 }
 

lib/resource-1.0/danish/IdiomDan.gf

@@ -4,27 +4,27 @@ concrete IdiomDan of Idiom = CatDan **
   flags optimize=all_subs ;
 
   lin
-    ImpersCl vp = mkClause "det" (agrP3 neutrum Sg) vp ;
+    ImpersCl vp = mkClause "det" (agrP3 MorphoDan.neutrum Sg) vp ;
-    GenericCl vp = mkClause "man" (agrP3 utrum Sg) vp ;
+    GenericCl vp = mkClause "man" (agrP3 MorphoDan.utrum Sg) vp ;
 
-    CleftNP np rs = mkClause "det" (agrP3 neutrum Sg) 
+    CleftNP np rs = mkClause "det" (agrP3 MorphoDan.neutrum Sg) 
       (insertObj (\\_ => rs.s ! np.a)
         (insertObj (\\_ => np.s ! rs.c) (predV verbBe))) ;
 
-    CleftAdv ad s = mkClause "det" (agrP3 neutrum Sg) 
+    CleftAdv ad s = mkClause "det" (agrP3 MorphoDan.neutrum Sg) 
       (insertObj (\\_ => "som" ++ s.s ! Sub)
         (insertObj (\\_ => ad.s) (predV verbBe))) ;
 
 
     ExistNP np = 
-      mkClause "det" (agrP3 neutrum Sg) (insertObj 
+      mkClause "det" (agrP3 MorphoDan.neutrum Sg) (insertObj 
         (\\_ => np.s ! accusative) (predV (depV finde_V))) ;
 
     ExistIP ip = {
       s = \\t,a,p => 
             let 
               cls = 
-               (mkClause "det" (agrP3 neutrum Sg) (predV (depV finde_V))).s ! t ! a ! p ;
+               (mkClause "det" (agrP3 MorphoDan.neutrum Sg) (predV (depV finde_V))).s ! t ! a ! p ;
               who = ip.s ! accusative
             in table {
               QDir   => who ++ cls ! Inv ;

lib/resource-1.0/danish/NumeralDan.gf

@@ -1,4 +1,4 @@
-concrete NumeralDan of Numeral = CatDan ** open ResScand, MorphoDan in {
+concrete NumeralDan of Numeral = CatDan ** open MorphoDan in {
 
 
 -- AR 12/10/2002 following www.geocities.com/tsca.geo/dansk/dknummer.html

lib/resource-1.0/french/DiffFre.gf

@@ -6,7 +6,7 @@ instance DiffFre of DiffRomance = open CommonRomance, PhonoFre, Prelude in {
 --  flags optimize=all ;
 
   param 
-    Prep = P_de | P_a ;
+    Prepos = P_de | P_a ;
     VType = VHabere | VEsse | VRefl ;
 
   oper

lib/resource-1.0/french/LexiconFre.gf

@@ -1,7 +1,7 @@
 --# -path=.:../romance:../common:../abstract:../../prelude
 
 concrete LexiconFre of Lexicon = CatFre ** 
-  open MorphoFre, ParadigmsFre, IrregFre in {
+  open (M = MorphoFre), ParadigmsFre, IrregFre in {
 
 flags 
   optimize=values ;
@@ -226,8 +226,8 @@ lin
   stop_V = reflV (regV "arrêter") ;
   jump_V = regV "sauter" ;
 
-  left_Ord = mkOrd (regA "gauche") ;
+  left_Ord = M.mkOrd (regA "gauche") ;
-  right_Ord = mkOrd (regA "droite") ;
+  right_Ord = M.mkOrd (regA "droite") ;
   far_Adv = mkAdv "loin" ;
   correct_A = regA "correct" ;
   dry_A = (mkA "sec" "sèche" "secs" "sèches") ;

lib/resource-1.0/german/CatGer.gf

@@ -14,21 +14,21 @@ concrete CatGer of Cat =
 
 -- Sentence
 
-    Cl = {s : Mood => Tense => Anteriority => Polarity => Order => Str} ;
+    Cl = {s : Mood => ResGer.Tense => Anteriority => Polarity => Order => Str} ;
-    Slash = {s : Mood => Tense => Anteriority => Polarity => Order => Str} ** 
+    Slash = {s : Mood => ResGer.Tense => Anteriority => Polarity => Order => Str} ** 
             {c2 : Preposition} ;
     Imp = {s : Polarity => ImpForm => Str} ;
 
 -- Question
 
-    QCl = {s : Mood => Tense => Anteriority => Polarity => QForm => Str} ;
+    QCl = {s : Mood => ResGer.Tense => Anteriority => Polarity => QForm => Str} ;
     IP = {s : Case => Str ; n : Number} ;
     IComp = {s : Agr => Str} ; 
     IDet = {s : Gender => Case => Str ; n : Number} ;
 
 -- Relative
 
-    RCl = {s : Mood => Tense => Anteriority => Polarity => GenNum => Str ; c : Case} ;
+    RCl = {s : Mood => ResGer.Tense => Anteriority => Polarity => GenNum => Str ; c : Case} ;
     RP = {s : GenNum => Case => Str ; a : RAgr} ;
 
 -- Verb
@@ -80,7 +80,7 @@ concrete CatGer of Cat =
 
 -- tense with possibility to choose conjunctive forms
 
-    Tense = {s : Str ; t : Tense ; m : Mood} ;
+    Tense = {s : Str ; t : ResGer.Tense ; m : Mood} ;
 
   lin
     TPres = {s = [] ; t = Pres ; m = MIndic} ;

lib/resource-1.0/german/IdiomGer.gf

@@ -9,11 +9,11 @@ concrete IdiomGer of Idiom = CatGer **
 
     CleftNP np rs = mkClause "es" (agrP3 Sg) 
       (insertExtrapos (rs.s ! gennum np.a.g np.a.n) ----
-        (insertObj (\\_ => np.s ! rs.c) (predV sein_V))) ;
+        (insertObj (\\_ => np.s ! rs.c) (predV MorphoGer.sein_V))) ;
 
     CleftAdv ad s = mkClause "es" (agrP3 Sg) 
       (insertExtrapos (conjThat ++ s.s ! Sub)
-        (insertObj (\\_ => ad.s) (predV sein_V))) ;
+        (insertObj (\\_ => ad.s) (predV MorphoGer.sein_V))) ;
 
 
     ExistNP np = 
@@ -41,6 +41,6 @@ concrete IdiomGer of Idiom = CatGer **
       } ;
 
   oper
-    geben = dirV2 (mkV "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ;
+    geben = dirV2 (mk6V "geben" "gibt" "gib" "gab" "gäbe" "gegeben") ;
 }
 

lib/resource-1.0/german/LexiconGer.gf

@@ -96,7 +96,7 @@ lin
   harbour_N = reg2N "Hafen" "Häfen" masculine ;
   hate_V2 = dirV2 (regV "hassen") ;
   hat_N = reg2N "Hut" "Hüte" masculine ;
-  have_V2 = dirV2 haben_V ;
+  have_V2 = dirV2 IrregGer.haben_V ;
   hear_V2 = dirV2 (regV "hören") ;
   hill_N = regN "Hügel" ;
   hope_VS = mkVS (regV "hoffen") ;

lib/resource-1.0/italian/DiffIta.gf

@@ -5,7 +5,7 @@ instance DiffIta of DiffRomance = open CommonRomance, PhonoIta, BeschIta, Prelud
   flags optimize=all ;
 
   param 
-    Prep = P_di | P_a | P_da | P_in | P_su | P_con ;
+    Prepos = P_di | P_a | P_da | P_in | P_su | P_con ;
     VType = VHabere | VEsse | VRefl ;
 
   oper

lib/resource-1.0/norwegian/IdiomNor.gf

@@ -5,26 +5,26 @@ concrete IdiomNor of Idiom = CatNor **
 
   lin
 
-    ImpersCl vp = mkClause "det" (agrP3 neutrum Sg) vp ;
+    ImpersCl vp = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) vp ;
     GenericCl vp = mkClause "man" (agrP3 utrum Sg) vp ;
 
-    CleftNP np rs = mkClause "det" (agrP3 neutrum Sg) 
+    CleftNP np rs = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) 
       (insertObj (\\_ => rs.s ! np.a)
         (insertObj (\\_ => np.s ! rs.c) (predV verbBe))) ;
 
-    CleftAdv ad s = mkClause "det" (agrP3 neutrum Sg) 
+    CleftAdv ad s = mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) 
       (insertObj (\\_ => "som" ++ s.s ! Sub)
         (insertObj (\\_ => ad.s) (predV verbBe))) ;
 
     ExistNP np = 
-      mkClause "det" (agrP3 neutrum Sg) (insertObj 
+      mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) (insertObj 
         (\\_ => np.s ! accusative) (predV (depV finne_V))) ;
 
     ExistIP ip = {
       s = \\t,a,p => 
             let 
               cls = 
-               (mkClause "det" (agrP3 neutrum Sg) (predV (depV finne_V))).s ! t ! a ! p ;
+               (mkClause "det" (agrP3 ParadigmsNor.neutrum Sg) (predV (depV finne_V))).s ! t ! a ! p ;
               who = ip.s ! accusative
             in table {
               QDir   => who ++ cls ! Inv ;

lib/resource-1.0/norwegian/LexiconNor.gf

@@ -53,18 +53,18 @@ lin
   close_V2 = dirV2 (mk2V "lukke" "lukket") ;
   coat_N = regGenN "frakk" masculine ;
   cold_A = regADeg "kald" ;
-  come_V = vaereV komme_V ;
+  come_V = vaereV IrregNor.komme_V ;
   computer_N = mk2N "datamaskin" "datamaskinen" ;
   country_N = mk2N "land" "landet" ;
   cousin_N = mk2N "fetter" "fetteren" ; ----
   cow_N = mkN "ku" "kua" "kyr" "kyrne" ; ----
-  die_V = vaereV dø_V ;
+  die_V = vaereV IrregNor.dø_V ;
   dirty_A = mk3ADeg "skitten" "skittent" "skitne" ; ----
   distance_N3 = mkN3 (regGenN "avstand" masculine) (mkPrep "fra") (mkPrep "til") ;
   doctor_N = mk2N "lege" "legen" ;
   dog_N = regGenN "hund" masculine ;
   door_N = regGenN "dør" feminine ;
-  drink_V2 = dirV2 drikke_V ;
+  drink_V2 = dirV2 IrregNor.drikke_V ;
   easy_A2V = mkA2V (regA "grei") (mkPrep "for") ;
   eat_V2 = dirV2 (mk2V "spise" "spiste") ;
   empty_A = mkADeg "tom" "tomt" "tomme" "tommere" "tommest" ;
@@ -85,12 +85,12 @@ lin
   glove_N = regGenN "hanske" masculine ;
   gold_N = regGenN "gull" neutrum ;
   good_A = mkADeg "god" "godt" "gode" "bedre" "best" ;
-  go_V = vaereV gå_V ;
+  go_V = vaereV IrregNor.gå_V ;
   green_A = mk2ADeg "grønn" "grønt" ;
   harbour_N = regGenN "havn" feminine;
   hate_V2 = dirV2 (regV "hate") ;
   hat_N = regGenN "hatt" masculine ;
-  have_V2 = dirV2 ha_V ;
+  have_V2 = dirV2 IrregNor.ha_V ;
   hear_V2 = dirV2 (mk2V "høre" "hørte") ;
   hill_N = regGenN "haug" masculine ;
   hope_VS = mkVS (regV "håpe") ;
@@ -101,7 +101,7 @@ lin
   industry_N = mk2N "industri" "industrien" ;
   iron_N = regGenN "jern" neutrum ;
   king_N = regGenN "konge" masculine ;
-  know_V2 = dirV2 vite_V ;
+  know_V2 = dirV2 IrregNor.vite_V ;
   lake_N = regGenN "vann" neutrum ;
   lamp_N = regGenN "lampe" feminine ;
   learn_V2 = dirV2 (mk2V "lære" "lærte") ; 
@@ -150,7 +150,7 @@ lin
   rock_N = regGenN "stein" masculine ;
   roof_N = regGenN "tak" neutrum ;
   rubber_N = mk2N "gummi" "gummien" ;
-  run_V = vaereV springe_V ;
+  run_V = vaereV IrregNor.springe_V ;
   say_VS = mkVS si_V ;
   school_N = regGenN "skole" feminine;
   science_N = mk2N "vitenskap" "vitenskapen" ;
@@ -197,7 +197,7 @@ lin
   university_N = regGenN "universitet" neutrum ;
   village_N = mk2N "grend" "grenda" ;
   wait_V2 = mkV2 (regV "vente") (mkPrep "på") ;
-  walk_V = vaereV gå_V ;
+  walk_V = vaereV IrregNor.gå_V ;
   warm_A = regADeg "varm" ;
   war_N = regGenN "krig" masculine ;
   watch_V2 = mkV2 se_V (mkPrep "på") ;
@@ -313,7 +313,7 @@ lin
   fight_V2 = dirV2 (slåss_V) ;
   float_V = flyte_V ;
   flow_V = renne_V ;
-  fly_V = vaereV fly_V ;
+  fly_V = vaereV IrregNor.fly_V ;
   freeze_V = fryse_V ;
   give_V3 = dirdirV3 gi_V ;
   hit_V2 = dirV2 (slå_V) ;

lib/resource-1.0/norwegian/NumeralNor.gf

@@ -1,4 +1,4 @@
-concrete NumeralNor of Numeral = CatNor ** open ResScand, MorphoNor in {
+concrete NumeralNor of Numeral = CatNor ** open MorphoNor in {
 
 lincat 
   Digit = {s : DForm => CardOrd => Str} ;

lib/resource-1.0/romance/DiffRomance.gf

@@ -14,7 +14,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
 -- Prepositions that fuse with the article
 -- (Fre, Spa "de", "a"; Ita also "con", "da", "in", "su).
 
-  param Prep ;
+  param Prepos ;
 
 -- Which types of verbs exist, in terms of auxiliaries.
 -- (Fre, Ita "avoir", "être", and refl; Spa only "haber" and refl).
@@ -99,7 +99,7 @@ interface DiffRomance = open CommonRomance, Prelude in {
 --2 Contants needed in type signatures above
 
 param
-  Case = Nom | Acc | CPrep Prep ; 
+  Case = Nom | Acc | CPrep Prepos ; 
 
 oper
   Verb = {s : VF => Str ; vtyp : VType} ;

lib/resource-1.0/russian/ConjunctionRus.gf

@@ -70,19 +70,22 @@ concrete ConjunctionRus of Conjunction =
 
 
 oper
-  -- We have to define a calculus of numbers of persons. For numbers,
--- it is like the conjunction with $Pl$ corresponding to $False$.
 
-  conjNumber : Number -> Number -> Number = \m,n -> case <m,n> of {
+-- We have to define a calculus of numbers of persons. For numbers,
-    <Sg,Sg> => Sg ;
+-- it is like the conjunction with $Pl$ corresponding to $False$.
-    _ => Pl 
+--
-    } ;
+-- The following are given in $ParamX$.
+--
+--  conjNumber : Number -> Number -> Number = \m,n -> case <m,n> of {
+--    <Sg,Sg> => Sg ;
+--    _ => Pl 
+--    } ;
 
 -- For persons, we let the latter argument win ("либо ты, либо я пойду"
 -- but "либо я, либо ты пойдешь"). This is not quite clear.
 
-  conjPerson : Person -> Person -> Person = \_,p -> 
+--  conjPerson : Person -> Person -> Person = \_,p -> 
-    p ;
+--    p ;
 
 -- For pron, we let the latter argument win - "Маша или моя мама" (Nominative case)
 -- but - "моей или Машина мама" (Genetive case) both corresponds to 

lib/resource-1.0/spanish/DiffSpa.gf

@@ -5,7 +5,7 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
   flags optimize=noexpand ;
 
   param 
-    Prep = P_de | P_a ;
+    Prepos = P_de | P_a ;
     VType = VHabere | VRefl ;
 
   oper

lib/resource-1.0/spanish/LexiconSpa.gf

@@ -1,7 +1,7 @@
 --# -path=.:../romance:../common:../abstract:../../prelude
 
 concrete LexiconSpa of Lexicon = CatSpa ** open 
-  MorphoSpa, ParadigmsSpa, BeschSpa in {
+  (M=MorphoSpa), ParadigmsSpa, BeschSpa in {
 
 flags 
   optimize=values ;
@@ -223,8 +223,8 @@ lin
    stop_V = regV "parar" ; 
    jump_V = regV "saltar" ;
 
-  left_Ord = mkOrd (regA "izquierda") ;
+  left_Ord = M.mkOrd (regA "izquierda") ;
-  right_Ord = mkOrd (regA "derecha") ;
+  right_Ord = M.mkOrd (regA "derecha") ;
   far_Adv = mkAdv "lejos" ; ----?
    correct_A = regA "correcto" ;
    dry_A = regA "seco" ;

lib/resource-1.0/spanish/StructuralSpa.gf

@@ -150,7 +150,7 @@ lin
       Masc Sg P3 ;
 
 oper
-  etConj : {s : Str ; n : Number} = {s = pre {
+  etConj : {s : Str ; n : MorphoSpa.Number} = {s = pre {
     "y" ; 
     "y" / strs {"ya" ; "ye" ; "yo" ; "yu"} ;
     "e" / strs {"i" ; "hi" ; "y"}