made App into a functor to make its body easier to modify; unfortunately, the import list must be copied however

1 files changed, 1 insertions, 29 deletions

diff --git a/examples/app/AppCat.gf b/examples/app/AppCat.gf
index d0d757154..5f4580cab 100644
--- a/examples/app/AppCat.gf
+++ b/examples/app/AppCat.gf
@@ -1,6 +1,5 @@
 --# -path=.:../../lib/src/chunk:../../lib/src/translator:../phrasebook/gfos
 
-
 concrete AppCat of App = 
 
   TranslateCat - [
@@ -25,31 +24,4 @@ concrete AppCat of App =
     PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
- --P ,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
-
-    ** open ParadigmsCat, SyntaxCat, Prelude in {
-
-flags
-  literal=Symb ;
-
--- to suppress punctuation
-lin
-  PSentence, PQuestion = \s -> lin Text (mkUtt s) ;
-  PGreetingMale, PGreetingFemale = \s -> lin Text s ;
-  GObjectPlease o = lin Text (mkUtt o) ;
-  PhrasePhr p = {s = "+" ++ p.s} | p ;
-  Phrase_Chunk p = p ;
-
-
-ComplV2V v np vp = mkVP v np vp ;
-ComplV2A v np vp = mkVP v np vp ;
-ComplV2Q v np vp = mkVP v np vp ;
-ComplV2S v np vp = mkVP v np vp ;
-ComplV3  v np vp = mkVP v np vp ;
-
-
-ComplV2 v np = mkVP v np ;
-
-  PassV2 v2 = passiveVP v2 ;
-  PassV2 v2 = passiveVP v2 ;
-}
+   ** AppFunctor with (Syntax = SyntaxCat) ;