Reorganized the peacekeeping grammar.

examples/peacekeeping/Peace.gf

@@ -0,0 +1 @@
+abstract Peace = PeaceSyntax, PeaceLexCommon, PeaceLexExt ** {}

examples/peacekeeping/PeaceCat.gf

@@ -0,0 +1,6 @@
+abstract PeaceCat = Cat ** {
+
+  cat
+    MassN ;
+
+}

examples/peacekeeping/PeaceCatI.gf

@@ -0,0 +1,6 @@
+incomplete concrete PeaceCatI of PeaceCat = Cat ** open Cat in {
+
+  lincat
+    MassN = N ;
+
+}

examples/peacekeeping/PeaceKeep_Eng.gf

@@ -1,5 +0,0 @@
---# -path=.:present:prelude
-
-concrete PeaceKeep_Eng of PeaceKeep = CatEng, PeaceLex_Eng ** PeaceKeepI with
-  (Lang = LangEng) ;
-

examples/peacekeeping/PeaceLexCommon.gf

@@ -1,7 +1,4 @@
-abstract PeaceLex = Cat ** {
+abstract PeaceLexCommon = PeaceCat ** {
-
-  cat
-    MassN ;
 
   fun
 
@@ -49,62 +46,39 @@ abstract PeaceLex = Cat ** {
     black_A : A ;
     blue_A : A ;
     cold_A : A ;
-    dangerous_A : A ;
-    dead_A : A ;
     green_A : A ;
     hot_A : A ;
-    hungry_A : A ;
-    large_A : A ;
     red_A : A ;
-    sick_A : A ;
     small_A : A ;
     white_A : A ;
     yellow_A : A ;
 
     -- Nouns
 
-    air_N : MassN ;
     airplane_N : N ;
-    arm_N : N ;
     animal_N : N ;
     blood_N : MassN ;
     boat_N : N ;
     boy_N : N ;
     child_N : N ;
-    corpse_N : N ;
-    building_N : N ;
-    car_N : N ;
-    doctor_N : N ;
-    enemy_N : N ;
     factory_N : N ;
-    food_N : MassN ;
     foot_N : N ;
-    friend_N : N ;
     girl_N : N ;
     hand_N : N ;
     head_N : N ;
     house_N : N ;
-    landmine_N : N ;
     leg_N : N ;
-    medicine_N : MassN ;
     man_N : N ;
     road_N : N ;
-    skin_N : MassN ;
-    soldier_N : N ;
     water_N : MassN ;
-    weapon_N : N ;
     woman_N : N;
 
     -- Verbs
-    cough_V : V ;
     eat_V2 : V2 ;
     drink_V2 : V2 ;
     give_V3 : V3 ;
     have_V2 : V2;
-    need_V2 : V2;
-    own_V2 : V2 ;
     see_V2 : V2 ;
-    show_V3 : V3 ;
     sleep_V : V ;
     walk_V : V ;
 

examples/peacekeeping/PeaceLexCommonI.gf

@@ -1,7 +1,4 @@
-concrete PeaceLex_Eng of PeaceLex = CatEng ** open LangEng, ParadigmsEng in {
+incomplete concrete PeaceLexCommonI of PeaceLexCommon = PeaceCatI ** open Lang in {
-
-  lincat
-    MassN = N ;
 
   lin
 
@@ -47,61 +44,38 @@ concrete PeaceLex_Eng of PeaceLex = CatEng ** open LangEng, ParadigmsEng in {
     black_A = black_A ;
     blue_A = blue_A ;
     cold_A = cold_A ;
-    dangerous_A = regA "dangerous" ;
-    dead_A = regA "dead" ;
     green_A = green_A ;
     hot_A = hot_A ;
-    hungry_A = regA "hungry" ;
-    large_A = regA "large" ;
     red_A = red_A ;
-    sick_A = regA "sick" ;
     small_A = small_A ;
     white_A = white_A ;
     yellow_A = yellow_A ;
 
     -- Nouns
-    air_N = regN "air" ;
     airplane_N = airplane_N ;
     animal_N = animal_N ;
-    arm_N = regN "arm" ;
     blood_N = blood_N ;
     boat_N = boat_N ;
     boy_N = boy_N ;
-    building_N = regN "building" ;
-    car_N = regN "car" ;
     child_N = child_N ;
-    corpse_N = regN "corpse" ;
-    doctor_N = regN "doctor";
-    enemy_N = regN "enemy";
     factory_N = factory_N ;
-    food_N = regN "food";
     foot_N = foot_N ;
-    friend_N = regN "friend";
     girl_N = girl_N ;
     hand_N = hand_N ;
     head_N = head_N ;
     house_N = house_N ;
-    landmine_N = regN "landmine" ;
     leg_N = leg_N ;
     man_N = man_N ;
-    medicine_N = regN "medicine" ;
     road_N = road_N ;
-    skin_N = regN "skin" ;
-    soldier_N = regN "soldier" ;
     water_N = water_N ;
-    weapon_N = regN "weapon";
     woman_N = woman_N ;
 
     -- Verbs
-    cough_V = regV "cough" ;
     drink_V2 = drink_V2 ;
     eat_V2 = eat_V2 ;
     give_V3 = give_V3;
     have_V2 = have_V2;
-    need_V2 = dirV2 (regV "need");
-    own_V2 = dirV2 (regV "own") ;
     see_V2 = see_V2 ;
-    show_V3 = dirdirV3 (regV "show") ;
     sleep_V = sleep_V ;
     walk_V = walk_V ;
 

examples/peacekeeping/PeaceLexExt.gf

@@ -0,0 +1,37 @@
+abstract PeaceLexExt = PeaceCat ** {
+
+  fun
+
+    -- Adjectives
+
+    dangerous_A : A ;
+    dead_A : A ;
+    hungry_A : A ;
+    large_A : A ;
+    sick_A : A ;
+
+    -- Nouns
+
+    air_N : MassN ;
+    arm_N : N ;
+    building_N : N ;
+    car_N : N ;
+    corpse_N : N ;
+    doctor_N : N ;
+    doctor_N : N ;
+    enemy_N : N ;
+    food_N : MassN ;
+    friend_N : N ;
+    landmine_N : N ;
+    medicine_N : MassN ;
+    skin_N : MassN ;
+    soldier_N : N ;
+    weapon_N : N;
+
+    -- Verbs
+    cough_V : V ;
+    need_V2 : V2;
+    own_V2 : V2 ;
+    show_V3 : V3 ;
+
+}

examples/peacekeeping/PeaceSyntax.gf

@@ -1,7 +1,9 @@
-abstract PeaceKeep = Cat, PeaceLex ** {
+abstract PeaceSyntax = PeaceCat ** {
 
   cat
-    Sent ; Quest; MassCN ;
+    Sent ; 
+    Quest ; 
+    MassCN ; 
 
   fun
     PhrPos    : Sent -> Phr ;

examples/peacekeeping/PeaceSyntaxI.gf

@@ -1,4 +1,4 @@
-incomplete concrete PeaceKeepI of PeaceKeep = open Lang in {
+incomplete concrete PeaceSyntaxI of PeaceSyntax = PeaceCatI ** open Lang in {
 
   flags 
     startcat = Phr ; optimize = all_subs ;

examples/peacekeeping/english/PeaceCat_Eng.gf

@@ -0,0 +1,3 @@
+--# -path=.:present:prelude
+
+concrete PeaceCat_Eng of PeaceCat = CatEng ** PeaceCatI with (Cat = CatEng);

examples/peacekeeping/english/PeaceLexCommon_Eng.gf

@@ -0,0 +1,5 @@
+--# -path=.:present:prelude
+
+concrete PeaceLexCommon_Eng of PeaceLexCommon = 
+  PeaceCat_Eng ** PeaceLexCommonI with (Lang = LangEng) ;
+

examples/peacekeeping/english/PeaceLexExt_Eng.gf

@@ -0,0 +1,37 @@
+--# -path=.:present:prelude
+
+concrete PeaceLexExt_Eng of PeaceLexExt = 
+  PeaceCat_Eng ** open ParadigmsEng in {
+
+  lin
+
+    -- Adjectives
+    dangerous_A = regA "dangerous" ;
+    dead_A = regA "dead" ;
+    hungry_A = regA "hungry" ;
+    large_A = regA "large" ;
+    sick_A = regA "sick" ;
+
+    -- Nouns
+    air_N = regN "air" ;
+    arm_N = regN "arm" ;
+    building_N = regN "building" ;
+    car_N = regN "car" ;
+    corpse_N = regN "corpse" ;
+    doctor_N = regN "doctor";
+    enemy_N = regN "enemy";
+    food_N = regN "food";
+    friend_N = regN "friend";
+    landmine_N = regN "landmine" ;
+    medicine_N = regN "medicine" ;
+    skin_N = regN "skin" ;
+    soldier_N = regN "soldier" ;
+    weapon_N = regN "weapon";
+
+    -- Verbs
+    cough_V = regV "cough" ;
+    need_V2 = dirV2 (regV "need");
+    own_V2 = dirV2 (regV "own") ;
+    show_V3 = dirdirV3 (regV "show") ;
+
+}

examples/peacekeeping/english/PeaceSyntax_Eng.gf

@@ -0,0 +1,5 @@
+--# -path=.:present:prelude
+
+concrete PeaceSyntax_Eng of PeaceSyntax = PeaceCat_Eng ** PeaceSyntaxI with
+  (Lang = LangEng) ;
+

examples/peacekeeping/english/Peace_Eng.gf

@@ -0,0 +1,3 @@
+--# -path=.:present:prelude
+
+concrete Peace_Eng of Peace = PeaceSyntax_Eng, PeaceLexCommon_Eng, PeaceLexExt_Eng ** {}