peace grammars patched to work with the new API

4 files changed, 37 insertions, 37 deletions

diff --git a/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf b/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
index aad047909..faf70724b 100644
--- a/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
+++ b/examples/peacekeeping/finnish/PeaceLexCommon_Fin.gf
@@ -1,5 +1,6 @@
 --# -path=.:present:prelude
 
 concrete PeaceLexCommon_Fin of PeaceLexCommon = 
-  PeaceCat_Fin ** PeaceLexCommonI with (Lang = LangFin) ;
+  PeaceCat_Fin ** PeaceLexCommonI with 
+  (Lang = LangFin), (Constructors = ConstructorsFin) ;
 
diff --git a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf b/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
index eade50a49..637b52d65 100644
--- a/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
+++ b/examples/peacekeeping/finnish/PeaceLexExt_Fin.gf
@@ -6,39 +6,39 @@ concrete PeaceLexExt_Fin of PeaceLexExt =
   lin
 
     -- Adjectives
-    dangerous_A = regA "vaarallinen" ;
-    dead_A = mkA (nRae "kuollut" "kuolleena") ;
-    hungry_A = regA "nälkäinen" ;
-    large_A = regA "iso" ;
-    sick_A = regA "sairas" ;
+    dangerous_A = mkA "vaarallinen" ;
+    dead_A = mkA (mkN "kuollut" "kuolleita") ;
+    hungry_A = mkA "nälkäinen" ;
+    large_A = mkA "iso" ;
+    sick_A = mkA "sairas" ;
 
     -- Nouns
-    air_N = regN "ilma" ;
-    arm_N = reg3N "käsi" "käden" "käsiä" ;
-    building_N = regN "rakennus" ;
-    car_N = regN "auto" ;
-    corpse_N = regN "ruumis" ;
-    doctor_N = regN "lääkäri";
-    enemy_N = regN "vihollinen";
-    face_N = regN "naama" ; ---- kasvot
-    food_N = regN "ruoka";
-    friend_N = regN "ystävä";
-    ground_N = regN "maa" ;
-    knife_N = reg2N "veitsi" "veitsiä" ; ---- veistä
-    landmine_N = regN "maamiina" ;
-    map_N = regN "kartta" ;
-    medicine_N = regN "lääke" ;
-    police8officer_N = regN "poliisi" ;
-    skin_N = regN "iho" ;
-    soldier_N = regN "sotilas" ;
-    weapon_N = regN "ase";
+    air_N = mkN "ilma" ;
+    arm_N = mk3N "käsi" "käden" "käsiä" ;
+    building_N = mkN "rakennus" ;
+    car_N = mkN "auto" ;
+    corpse_N = mkN "ruumis" ;
+    doctor_N = mkN "lääkäri";
+    enemy_N = mkN "vihollinen";
+    face_N = mkN "naama" ; ---- kasvot
+    food_N = mkN "ruoka";
+    friend_N = mkN "ystävä";
+    ground_N = mkN "maa" ;
+    knife_N = mk2N "veitsi" "veitsiä" ; ---- veistä
+    landmine_N = mkN "maamiina" ;
+    map_N = mkN "kartta" ;
+    medicine_N = mkN "lääke" ;
+    police8officer_N = mkN "poliisi" ;
+    skin_N = mkN "iho" ;
+    soldier_N = mkN "sotilas" ;
+    weapon_N = mkN "ase";
 
     -- Verbs
-    cough_V = regV "yskiä" ;
-    drop_V2 = dirV2 (regV "pudottaa") ;
-    hurt_V = regV "sattua" ;
-    need_V2 = dirV2 (regV "tarvita");
-    own_V2 = dirV2 (regV "omistaa") ;
-    show_V3 = dirdirV3 (regV "näyttää") ;
+    cough_V = mkV "yskiä" ;
+    drop_V2 = dirV2 (mkV "pudottaa") ;
+    hurt_V = mkV "sattua" ;
+    need_V2 = dirV2 (mkV "tarvita");
+    own_V2 = dirV2 (mkV "omistaa") ;
+    show_V3 = dirdirV3 (mkV "näyttää") ;
 
 }
diff --git a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
index bd528c36b..1949e30e7 100644
--- a/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
+++ b/examples/peacekeeping/finnish/PeacePhrases_Fin.gf
@@ -1,14 +1,13 @@
 --# -path=.:..:present:prelude
 
 concrete PeacePhrases_Fin of PeacePhrases = 
-  PeaceCat_Fin ** open LangFin, ParadigmsFin, PeaceRes in {
+  PeaceCat_Fin ** open LangFin, ParadigmsFin, ConstructorsFin, PeaceRes in {
 
 lin
     Hello = stop "terve" ;
     GoodMorning = stop ["hyvää huomenta"] ;
     GoodEvening = stop ["hyvää iltaa"] ;
-    WhatIsNamePron p = quest (PhrUtt NoPConj (UttQS (UseQCl TPres ASimul PPos 
-      (QuestVP whatSg_IP (UseComp (CompNP (DetCN (DetSg (SgQuant (PossPron p)) NoOrd) 
-      (UseN (reg2N "nimi" "nimiä")))))))) NoVoc).s ;
+    WhatIsNamePron p = quest (
+       mkPhr (mkUtt (mkQS (mkQCl whatSg_IP (mkVP (mkNP (mkDet p) name_N)))))).s ;
 
-}
\ No newline at end of file
+}
diff --git a/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf b/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
index 80bd821c4..3e728dbf8 100644
--- a/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
+++ b/examples/peacekeeping/finnish/PeaceSyntax_Fin.gf
@@ -1,5 +1,5 @@
 --# -path=.:present:prelude
 
 concrete PeaceSyntax_Fin of PeaceSyntax = PeaceCat_Fin ** PeaceSyntaxI with
-  (Lang = LangFin) ;
+  (Lang = LangFin), (Constructors = ConstructorsFin) ;