rewrote App so that it just inherits Translate and excludes some functions. This minimizes the duplication of code between Translate and App. Also added some functions, which make App 15% slower but increase the coverage and quality. This trade-off has to be studied further.

1 files changed, 30 insertions, 45 deletions

diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index 9cd6c551c..b1d147977 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -1,47 +1,37 @@
 --# -path=.:src/chunk:src/translator:../examples/phrasebook/gfos
 
 concrete AppSpa of App = 
-  TenseSpa,
-  NounSpa - [PPartNP],
-  AdjectiveSpa,
-  NumeralSpa,
-  SymbolSpa [
-    PN, Symb, String, CN, Card, NP, MkSymb, SymbPN, CNNumNP
-    ],
-  ConjunctionSpa,
-  VerbSpa [ 
-    UseV,ComplVV,SlashV2a,ComplSlash,UseComp,CompAP,CompNP,CompAdv,CompCN
-    ,AdvVP,AdVVP
-    ],
-  AdverbSpa,
-  PhraseSpa,
-  SentenceSpa [
-    PredVP,SlashVP,ImpVP,AdvS,
-    UseCl,UseQCl,UseSlash,SSubjS,UseRCl
-    ],        
-  QuestionSpa - [
-    ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP
-    ],
-  RelativeSpa,
-  IdiomSpa [
-    NP, VP, Tense, Cl, ProgrVP, ExistNP, 
-    neutr, sjalv
-    ],
-----  ConstructionSpa,
 
-  ChunkSpa,
-
-  ExtensionsSpa [
-     CompoundCN,AdAdV,UttAdV,ApposNP,
-     MkVPI, MkVPS, PredVPS, that_RP, who_RP
-     ],
-
-  DocumentationSpa,
-  DictionarySpa 
-
-  ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A]
-
-    ** open MorphoSpa, ResSpa, ParadigmsSpa, SyntaxSpa, CommonScand, (E = ExtraSpa), Prelude in {
+  TranslateSpa - [
+  -- Verb
+    ComplVS, ComplVQ, ComplVA,
+    Slash2V3, Slash3V3, SlashV2V, SlashV2S, SlashV2Q, SlashV2A,
+    SlashVV, SlashV2VNP,
+    ReflVP,
+    AdvVPSlash, AdVVPSlash, VPSlashPrep,
+  -- Sentence
+    PredSCVP, 
+    AdvSlash, SlashPrep, SlashVS,
+    EmbedS, EmbedQS, EmbedVP, RelS,
+  -- Question
+    ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP,
+  -- Idiom
+    CleftNP, CleftAdv,
+    ExistIP,
+    ExistNPAdv, ExistIPAdv,
+    ImpP3,
+    SelfAdvVP, SelfAdVVP, SelfNP,
+  -- Construction
+    hungry_VP, thirsty_VP, has_age_VP, have_name_Cl, married_Cl, what_name_QCl, how_old_QCl, how_far_QCl,
+    weather_adjCl, is_right_VP, is_wrong_VP, n_units_AP, bottle_of_CN, cup_of_CN, glass_of_CN, 
+    where_go_QCl, where_come_from_QCl, go_here_VP, come_here_VP, come_from_here_VP, go_there_VP, come_there_VP, come_from_there_VP,
+  -- Extensions
+    PassVPSlash, PassAgentVPSlash
+  ]
+
+  ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
+
+    ** open ParadigmsSpa, SyntaxSpa, Prelude in {
 
 flags
   literal=Symb ;
@@ -50,13 +40,8 @@ flags
 lin
   PSentence, PQuestion = \s -> lin Text (mkUtt s) ;
   PGreetingMale, PGreetingFemale = \s -> lin Text s ;
-
   GObjectPlease o = lin Text (mkUtt o) ;
-
-
-lin
   PhrasePhr p = {s = "+" ++ p.s} | p ;
-
   Phrase_Chunk p = p ;
 
 }