commented out the import of Phrasebook in App with --P; the idea is that application grammar parsing is done in a separate phase, which is faster and more flexible. Also re-enabled ComplV3 and ComplV2V, after testing that they don't reduce the parsing speed too much.

1 files changed, 11 insertions, 11 deletions

diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf
index 313e0b6ff..10e84f9a8 100644
--- a/examples/app/AppEng.gf
+++ b/examples/app/AppEng.gf
@@ -24,7 +24,7 @@ concrete AppEng of App =
     PassVPSlash, PassAgentVPSlash -- not reachable anyway
   ]
 
-  ,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
+--P  ,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
 
    ** open MorphoEng, ResEng, ParadigmsEng, SyntaxEng, (G = GrammarEng), (E = ExtraEng), Prelude in {
 
@@ -33,21 +33,21 @@ flags
 
 -- 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 ;
+--P  PSentence, PQuestion = \s -> lin Text (mkUtt s) ;
+--P  PGreetingMale, PGreetingFemale = \s -> lin Text s ;
+--P  GObjectPlease o = lin Text (mkUtt o) ;
+--P  PhrasePhr p = {s = "+" ++ p.s} | p ;
+--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 ;
+--  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 ;
+PassV2 v2 = passiveVP v2 ;
+
 }