Some peacekeeping clean-up, still far from compiling.

2026-04-09 04:59:31 -06:00 · 2008-08-18 20:22:25 +00:00
parent 256ab54807
commit 401d1cd7d1
11 changed files with 18 additions and 42 deletions
--- a/examples/peacekeeping/Makefile
+++ b/examples/peacekeeping/Makefile
@@ -0,0 +1,2 @@
+peace.pgf: 
+	gfc --make english/Peace_Eng.gf swedish/Peace_Swe.gf
--- a/examples/peacekeeping/Peace.gf
+++ b/examples/peacekeeping/Peace.gf
@@ -1,4 +1,8 @@
 abstract Peace = 
  PeaceSyntax, PeaceLexCommon, 
  PeaceLexExt, PeacePhrases 
-  ** {}
+  ** {
+
+  flags startcat = PhraseWritten ; 
+
+}
--- a/examples/peacekeeping/PeaceSpoken.gf
+++ b/examples/peacekeeping/PeaceSpoken.gf
@@ -1 +1,5 @@
-abstract PeaceSpoken = Peace ** {}
+abstract PeaceSpoken = Peace ** {
+
+  flags startcat = PhraseSpoken ; 
+
+}
--- 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
--- 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;
--- 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;
--- 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;
--- 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;
--- a/examples/peacekeeping/mkPeace.gfs
+++ b/examples/peacekeeping/mkPeace.gfs
@@ -1,4 +0,0 @@
-i -optimize=share english/Peace_Eng.gf
-i -optimize=share swedish/Peace_Swe.gf
-s
-pm | wf peace.gfcm
--- 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;
--- 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;