From ea8375dc44ede9fa92232d051f73b818ad64b71b Mon Sep 17 00:00:00 2001
From: krasimir <krasimir@chalmers.se>
Date: Fri, 17 Sep 2010 16:20:47 +0000
Subject: [PATCH] fix the compilation of CountriesAndRegionsEng.gf

---
 examples/SUMO/CountriesAndRegionsEng.gf | 9 ++-------
 examples/SUMO/MondialEng.gf             | 6 ++++++
 examples/SUMO/SUMOEng.gf                | 1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/examples/SUMO/CountriesAndRegionsEng.gf b/examples/SUMO/CountriesAndRegionsEng.gf
index 8ac58bc6e..89c366300 100644
--- a/examples/SUMO/CountriesAndRegionsEng.gf
+++ b/examples/SUMO/CountriesAndRegionsEng.gf
@@ -1,5 +1,5 @@
 --# -path=.:englishExtended
-concrete CountriesAndRegionsEng of CountriesAndRegions = MidLevelOntologyEng, GeographyEng, GovernmentEng ** open ParadigmsEng,NounEng  in {
+concrete CountriesAndRegionsEng of CountriesAndRegions = MidLevelOntologyEng ** open ParadigmsEng,NounEng  in {
   
 lin 
   NewJersey = UsePN (mkPN "New Jersey") ;
@@ -615,7 +615,7 @@ lin
   GloriosoIslands = UsePN (mkPN "Glorioso Islands") ;
   HeardIslandAndMcDonaldIslands = UsePN (mkPN "Heard Island and McDonald Islands") ;
   JuanDeNovaIsland = UsePN (mkPN "Juan de Nova Island") ;
-  Lesotho = variants (UsePN (mkPN "Lesotho")) (UsePN (mkPN "Basutoland")) ;
+  Lesotho = UsePN (mkPN "Lesotho" | mkPN "Basutoland") ;
   Madagascar = UsePN (mkPN "Madagascar") ;
   Malawi = UsePN (mkPN "Malawi") ;
   Mauritius = UsePN (mkPN "Mauritius") ;
@@ -643,7 +643,6 @@ lin
   Mali = UsePN (mkPN "Mali") ;
   Niger = UsePN (mkPN "Niger") ;
   Nigeria = UsePN (mkPN "Nigeria") ;
-  SaoTomeAndPrincipe = UsePN (mkPN "Sao Tome and Principe") ;
   Senegal = UsePN (mkPN "Senegal") ;
   SierraLeone = UsePN (mkPN "Sierra Leone") ;
   Togo = UsePN (mkPN "Togo") ;
@@ -711,7 +710,6 @@ lin
   Macedonia = UsePN (mkPN "Macedonia") ;
   Romania = UsePN (mkPN "Romania") ;
   Turkey = UsePN (mkPN "Turkey") ;
-  SerbiaAndMontenegro = UsePN (mkPN "Serbia and Montenegro") ;
   Andorra = UsePN (mkPN "Andorra") ;
   Gibraltar = UsePN (mkPN "Gibraltar") ;
   Portugal = UsePN (mkPN "Portugal") ;
@@ -740,10 +738,7 @@ lin
   NavassaIsland = UsePN (mkPN "Navassa Island") ;
   NetherlandsAntilles = UsePN (mkPN "Netherlands Antilles") ;
   PuertoRico = UsePN (mkPN "Puerto Rico") ;
-  SaintKittsAndNevis = UsePN (mkPN "Saint Kitts and Nevis") ;
   SaintLucia = UsePN (mkPN "Saint Lucia") ;
-  SaintVincentAndTheGrenadines = UsePN (mkPN "Saint Vincent and the Grenadines") ;
-  TrinidadAndTobago = UsePN (mkPN "Trinidad and Tobago") ;
   TurksAndCaicosIslands = UsePN (mkPN "Turks and Caicos Islands") ;
   VirginIslands = UsePN (mkPN "Virgin Islands") ;
   Belize = UsePN (mkPN "Belize") ;
diff --git a/examples/SUMO/MondialEng.gf b/examples/SUMO/MondialEng.gf
index a9c91d850..c1658515a 100644
--- a/examples/SUMO/MondialEng.gf
+++ b/examples/SUMO/MondialEng.gf
@@ -5553,4 +5553,10 @@ lin
   Countries_VN_cities_ThaiNguyen = UsePN (mkPN "Thai Nguyen") ;
   Countries_ZRE_provinces_BasZaire = UsePN (mkPN "Bas Zaire") ;
   Countries_UA_provinces_Poltavska = UsePN (mkPN "Poltavska") ;
+  SaintKittsAndNevis = UsePN (mkPN "Saint Kitts and Nevis") ;
+  SaintVincentAndTheGrenadines = UsePN (mkPN "Saint Vincent and the Grenadines") ;
+  SaoTomeAndPrincipe = UsePN (mkPN "Sao Tome and Principe") ;
+  SerbiaAndMontenegro = UsePN (mkPN "Serbia and Montenegro") ;
+  TrinidadAndTobago = UsePN (mkPN "Trinidad and Tobago") ;
+
 }
diff --git a/examples/SUMO/SUMOEng.gf b/examples/SUMO/SUMOEng.gf
index 696b76f8a..43e979f2a 100644
--- a/examples/SUMO/SUMOEng.gf
+++ b/examples/SUMO/SUMOEng.gf
@@ -5,6 +5,7 @@ concrete SUMOEng of SUMO =
         EconomyEng,
         EngineeringEng,
         MondialEng,
+        CountriesAndRegionsEng,
         QoSontologyEng
 
 ** {