fixed naming conflicts in resource

2007-06-17 22:52:27 +00:00
parent 3adf824e8e
commit 6a2cbe19d2
21 changed files with 68337 additions and 68334 deletions
--- a/lib/resource-1.0/catalan/DiffCat.gf
+++ b/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
--- a/lib/resource-1.0/catalan/LexiconCat.gf
+++ b/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 ;
--- a/lib/resource-1.0/catalan/StructuralCat.gf
+++ b/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} ;

 }