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

This commit is contained in:
aarne
2016-06-04 17:07:35 +00:00
parent 4fea4ace7b
commit e682f0972d
19 changed files with 64 additions and 462 deletions

View File

@@ -24,33 +24,5 @@ concrete AppEng of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
--P ,PhrasebookEng - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv]
** AppFunctor with (Syntax = SyntaxEng) ;
** open MorphoEng, ResEng, ParadigmsEng, SyntaxEng, (G = GrammarEng), (E = ExtraEng), Prelude in {
flags
literal=Symb ;
-- to suppress punctuation
lin
--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 ;
ComplV3 v np vp = mkVP v np vp ;
ComplV2 v np = mkVP v np ;
PassV2 v2 = passiveVP v2 ;
RelV2 rp np v2 = mkRCl rp (mkClSlash np (mkVPSlash v2)) ;
QuestV2 ip np v2 = mkQCl ip (mkClSlash np (mkVPSlash v2)) ;
}