Some peacekeeping clean-up, still far from compiling.

11 files changed, 18 insertions, 42 deletions

diff --git a/examples/peacekeeping/Makefile b/examples/peacekeeping/Makefile
new file mode 100644
index 000000000..3e8cc0af8
--- /dev/null
+++ b/examples/peacekeeping/Makefile
@@ -0,0 +1,2 @@
+peace.pgf: 
+	gfc --make english/Peace_Eng.gf swedish/Peace_Swe.gf
diff --git a/examples/peacekeeping/Peace.gf b/examples/peacekeeping/Peace.gf
index f7514ac8b..506fdf62a 100644
--- a/examples/peacekeeping/Peace.gf
+++ b/examples/peacekeeping/Peace.gf
@@ -1,4 +1,8 @@
 abstract Peace = 
   PeaceSyntax, PeaceLexCommon, 
   PeaceLexExt, PeacePhrases 
-  ** {}
\ No newline at end of file
+  ** {
+
+  flags startcat = PhraseWritten ; 
+
+}
\ No newline at end of file
diff --git a/examples/peacekeeping/PeaceSpoken.gf b/examples/peacekeeping/PeaceSpoken.gf
index 59d7210f3..be4efd406 100644
--- a/examples/peacekeeping/PeaceSpoken.gf
+++ b/examples/peacekeeping/PeaceSpoken.gf
@@ -1 +1,5 @@
-abstract PeaceSpoken = Peace ** {}
\ No newline at end of file
+abstract PeaceSpoken = Peace ** {
+
+  flags startcat = PhraseSpoken ; 
+
+}
\ No newline at end of file
diff --git a/examples/peacekeeping/PeaceSyntaxI.gf b/examples/peacekeeping/PeaceSyntaxI.gf
index 89517d735..9f29f9f3c 100644
--- a/examples/peacekeeping/PeaceSyntaxI.gf
+++ b/examples/peacekeeping/PeaceSyntaxI.gf
@@ -2,8 +2,6 @@ incomplete concrete PeaceSyntaxI of PeaceSyntax =
   PeaceCatI ** open Lang,PeaceRes in {
 
   flags 
---    optimize = all_subs ;
-    optimize = share ;
     unlexer = text ; lexer = text ;
 
   lincat
diff --git a/examples/peacekeeping/english/PeaceSpoken_Eng.gf b/examples/peacekeeping/english/PeaceSpoken_Eng.gf
index bdd81bd9f..d18b43945 100644
--- a/examples/peacekeeping/english/PeaceSpoken_Eng.gf
+++ b/examples/peacekeeping/english/PeaceSpoken_Eng.gf
@@ -1,8 +1,4 @@
 --# -path=.:..:present:prelude
 
 concrete PeaceSpoken_Eng of PeaceSpoken = 
-  Peace_Eng ** {
-
-  flags startcat = PhraseSpoken ; 
-
-}
+  Peace_Eng;
diff --git a/examples/peacekeeping/english/Peace_Eng.gf b/examples/peacekeeping/english/Peace_Eng.gf
index dff33298b..87dd076ee 100644
--- a/examples/peacekeeping/english/Peace_Eng.gf
+++ b/examples/peacekeeping/english/Peace_Eng.gf
@@ -2,9 +2,4 @@
 
 concrete Peace_Eng of Peace = 
   PeaceSyntax_Eng, PeaceLexCommon_Eng, 
-  PeaceLexExt_Eng, PeacePhrases_Eng
-  ** {
-
-  flags startcat = PhraseWritten ; 
-
-}
+  PeaceLexExt_Eng, PeacePhrases_Eng;
\ No newline at end of file
diff --git a/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf b/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
index 98a23732b..95cdd7de9 100644
--- a/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
+++ b/examples/peacekeeping/finnish/PeaceSpoken_Fin.gf
@@ -1,8 +1,3 @@
 --# -path=.:..:present:prelude
 
-concrete PeaceSpoken_Fin of PeaceSpoken = 
-  Peace_Fin ** {
-
-  flags startcat = PhraseSpoken ; 
-
-}
+concrete PeaceSpoken_Fin of PeaceSpoken = Peace_Fin;
diff --git a/examples/peacekeeping/finnish/Peace_Fin.gf b/examples/peacekeeping/finnish/Peace_Fin.gf
index f8e19d2b6..905ee2bf8 100644
--- a/examples/peacekeeping/finnish/Peace_Fin.gf
+++ b/examples/peacekeeping/finnish/Peace_Fin.gf
@@ -2,9 +2,4 @@
 
 concrete Peace_Fin of Peace = 
   PeaceSyntax_Fin, PeaceLexCommon_Fin, 
-  PeaceLexExt_Fin, PeacePhrases_Fin
-  ** {
-
-  flags startcat = PhraseWritten ; 
-	optimize = all_subs ;
-}
+  PeaceLexExt_Fin, PeacePhrases_Fin;
diff --git a/examples/peacekeeping/mkPeace.gfs b/examples/peacekeeping/mkPeace.gfs
deleted file mode 100644
index 169cc8480..000000000
--- a/examples/peacekeeping/mkPeace.gfs
+++ /dev/null
@@ -1,4 +0,0 @@
-i -optimize=share english/Peace_Eng.gf
-i -optimize=share swedish/Peace_Swe.gf
-s
-pm | wf peace.gfcm
diff --git a/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf b/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
index d622a1c07..51ed8392c 100644
--- a/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
+++ b/examples/peacekeeping/swedish/PeaceSpoken_Swe.gf
@@ -1,8 +1,4 @@
 --# -path=.:..:present:prelude
 
 concrete PeaceSpoken_Swe of PeaceSpoken = 
-  Peace_Swe ** {
-
-  flags startcat = PhraseSpoken ; 
-
-}
+  Peace_Swe;
\ No newline at end of file
diff --git a/examples/peacekeeping/swedish/Peace_Swe.gf b/examples/peacekeeping/swedish/Peace_Swe.gf
index c08e227d3..7c7b2c213 100644
--- a/examples/peacekeeping/swedish/Peace_Swe.gf
+++ b/examples/peacekeeping/swedish/Peace_Swe.gf
@@ -2,9 +2,4 @@
 
 concrete Peace_Swe of Peace = 
   PeaceSyntax_Swe, PeaceLexCommon_Swe, 
-  PeaceLexExt_Swe, PeacePhrases_Swe
-  ** {
-
-  flags startcat = PhraseWritten ; 
-
-}
+  PeaceLexExt_Swe, PeacePhrases_Swe;
\ No newline at end of file