From 4f6c5cbacfe64ff098ee666d604253c232797ea7 Mon Sep 17 00:00:00 2001 From: aarne Date: Sat, 4 Jun 2016 17:07:35 +0000 Subject: [PATCH] made App into a functor to make its body easier to modify; unfortunately, the import list must be copied however --- examples/app/App.gf | 3 +-- examples/app/AppBul.gf | 29 +----------------------- examples/app/AppCat.gf | 30 +------------------------ examples/app/AppChi.gf | 31 +------------------------- examples/app/AppDut.gf | 29 +----------------------- examples/app/AppEng.gf | 30 +------------------------ examples/app/AppEst.gf | 29 +----------------------- examples/app/AppFin.gf | 29 +----------------------- examples/app/AppFre.gf | 30 +------------------------ examples/app/AppFunctor.gf | 45 ++++++++++++++++++++++++++++++++++++++ examples/app/AppGer.gf | 29 +----------------------- examples/app/AppHin.gf | 29 +----------------------- examples/app/AppIta.gf | 28 +----------------------- examples/app/AppJpn.gf | 31 +------------------------- examples/app/AppRus.gf | 30 +------------------------ examples/app/AppSpa.gf | 29 +----------------------- examples/app/AppSwe.gf | 32 +-------------------------- examples/app/AppTha.gf | 30 +------------------------ examples/app/Makefile | 3 ++- 19 files changed, 64 insertions(+), 462 deletions(-) create mode 100644 examples/app/AppFunctor.gf diff --git a/examples/app/App.gf b/examples/app/App.gf index 570607bc8..e2f871110 100644 --- a/examples/app/App.gf +++ b/examples/app/App.gf @@ -34,15 +34,14 @@ fun --P Phrase_Chunk : Phrase -> Chunk ; ComplV2 : V2 -> NP -> VP ; - PassV2 : V2 -> VP ; ComplV2V : V2V -> NP -> VP -> VP ; -- ComplV2A : V2A -> NP -> AP -> VP ; -- ComplV2Q : V2Q -> NP -> QS -> VP ; -- ComplV2S : V2S -> NP -> S -> VP ; - ComplV3 : V3 -> NP -> NP -> VP ; + PassV2 : V2 -> VP ; RelV2 : RP -> NP -> V2 -> RCl ; QuestV2 : IP -> NP -> V2 -> QCl ; diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf index d62fb4732..a447fdc48 100644 --- a/examples/app/AppBul.gf +++ b/examples/app/AppBul.gf @@ -24,32 +24,5 @@ concrete AppBul of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] + ** AppFunctor with (Syntax = SyntaxBul) ; - ** open ParadigmsBul, SyntaxBul, 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 ; -} 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) ; diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf index 8abffcc0c..a24aa2df8 100644 --- a/examples/app/AppChi.gf +++ b/examples/app/AppChi.gf @@ -24,33 +24,4 @@ concrete AppChi of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] - - ** open ParadigmsChi, SyntaxChi, 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 = SyntaxChi) ; diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf index eba751d20..27b88b4b6 100644 --- a/examples/app/AppDut.gf +++ b/examples/app/AppDut.gf @@ -24,31 +24,4 @@ concrete AppDut of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] ---P ,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] - - ** open ParadigmsDut, SyntaxDut, 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 = SyntaxDut) ; diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf index 12e5624e8..2317a6023 100644 --- a/examples/app/AppEng.gf +++ b/examples/app/AppEng.gf @@ -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)) ; - -} diff --git a/examples/app/AppEst.gf b/examples/app/AppEst.gf index ab1d256e0..b7986172e 100644 --- a/examples/app/AppEst.gf +++ b/examples/app/AppEst.gf @@ -24,31 +24,4 @@ concrete AppEst of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookEst - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv] - - ** open ParadigmsEst, SyntaxEst, Prelude in { - -flags - literal=Symb ; - -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 = SyntaxEst) ; diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf index c086c1e6e..43e1bfc20 100644 --- a/examples/app/AppFin.gf +++ b/examples/app/AppFin.gf @@ -24,31 +24,4 @@ concrete AppFin of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] ---P ,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv] - - ** open ParadigmsFin, SyntaxFin, Prelude in { - -flags - literal=Symb ; - -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 = SyntaxFin) ; diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf index 91227a76e..5ecf3c24a 100644 --- a/examples/app/AppFre.gf +++ b/examples/app/AppFre.gf @@ -22,33 +22,5 @@ concrete AppFre of App = -- Extensions PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A] - ** open ParadigmsFre, SyntaxFre, Prelude in { - -flags - literal=Symb ; - -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 ; - - ComplV2 v np = mkVP v np ; - -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 = SyntaxFre) ; diff --git a/examples/app/AppFunctor.gf b/examples/app/AppFunctor.gf new file mode 100644 index 000000000..b96bf1b1c --- /dev/null +++ b/examples/app/AppFunctor.gf @@ -0,0 +1,45 @@ +incomplete concrete AppFunctor of App = + + Translate - [ + -- Verb + SlashV2a,ComplSlash, -- replaced by a more efficient inlined version + SlashV2V, + Slash2V3, Slash3V3, SlashV2S, SlashV2Q, SlashV2A, + SlashVV, SlashV2VNP, + AdvVPSlash, AdVVPSlash, VPSlashPrep, + -- Sentence + SlashVP, SlashVS, + PredSCVP, + AdvSlash, SlashPrep, SlashVS, + EmbedS, EmbedQS, EmbedVP, RelS, + -- Question + ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP, + -- Idiom + CleftNP, CleftAdv, + ImpP3, + -- Construction + -- Extensions + PassVPSlash, PassAgentVPSlash -- not reachable anyway + ] + + ** open Syntax in { + +flags + literal=Symb ; + +lin + ComplV2 v np = mkVP v np ; + + 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 ; + + + + PassV2 v2 = passiveVP v2 ; + RelV2 rp np v2 = mkRCl rp (mkClSlash np (mkVPSlash v2)) ; + QuestV2 ip np v2 = mkQCl ip (mkClSlash np (mkVPSlash v2)) ; + +} diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf index f607303c7..5196865d6 100644 --- a/examples/app/AppGer.gf +++ b/examples/app/AppGer.gf @@ -24,31 +24,4 @@ concrete AppGer of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] ---P ,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] - - ** open ParadigmsGer, SyntaxGer, 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 = SyntaxGer) ; diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf index 8f8edb773..10443facb 100644 --- a/examples/app/AppHin.gf +++ b/examples/app/AppHin.gf @@ -23,32 +23,5 @@ concrete AppHin of App = -- Extensions PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] - ** open ParadigmsHin, SyntaxHin, 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 = SyntaxHin) ; diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf index 5aec6b376..53f3cddf4 100644 --- a/examples/app/AppIta.gf +++ b/examples/app/AppIta.gf @@ -24,30 +24,4 @@ concrete AppIta of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A] - - ** open ParadigmsIta, SyntaxIta, Prelude in { - -flags - literal=Symb ; - -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 = SyntaxIta) ; diff --git a/examples/app/AppJpn.gf b/examples/app/AppJpn.gf index cfe61cc90..474c8e926 100644 --- a/examples/app/AppJpn.gf +++ b/examples/app/AppJpn.gf @@ -24,33 +24,4 @@ concrete AppJpn of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] - - ** open ParadigmsJpn, SyntaxJpn, 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 = SyntaxJpn) ; diff --git a/examples/app/AppRus.gf b/examples/app/AppRus.gf index a64498426..2539b2b1b 100644 --- a/examples/app/AppRus.gf +++ b/examples/app/AppRus.gf @@ -24,32 +24,4 @@ concrete AppRus of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] ---P ,PhrasebookRus - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, cost_V] - - ** open ParadigmsRus, SyntaxRus, 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 = SyntaxRus) ; diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf index 842d230ae..a32378031 100644 --- a/examples/app/AppSpa.gf +++ b/examples/app/AppSpa.gf @@ -25,31 +25,4 @@ concrete AppSpa of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A] - - ** open ParadigmsSpa, SyntaxSpa, 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 = SyntaxSpa) ; diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf index ee48f1462..87d4e9449 100644 --- a/examples/app/AppSwe.gf +++ b/examples/app/AppSwe.gf @@ -23,34 +23,4 @@ concrete AppSwe of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A] - - ** open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), 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 = SyntaxSwe.passiveVP v2 ; - -RelV2 rp np v2 = mkRCl rp (mkClSlash np (mkVPSlash v2)) ; -QuestV2 ip np v2 = mkQCl ip (mkClSlash np (mkVPSlash v2)) ; - -} + ** AppFunctor with (Syntax = SyntaxSwe) ; diff --git a/examples/app/AppTha.gf b/examples/app/AppTha.gf index c2f8c2bb7..8c46afa8d 100644 --- a/examples/app/AppTha.gf +++ b/examples/app/AppTha.gf @@ -24,33 +24,5 @@ concrete AppTha of App = PassVPSlash, PassAgentVPSlash -- not reachable anyway ] - --P ,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep] + ** AppFunctor with (Syntax = SyntaxTha) ; - ** open ParadigmsTha, SyntaxTha, 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 ; -} diff --git a/examples/app/Makefile b/examples/app/Makefile index feedab8c9..4af304a9e 100644 --- a/examples/app/Makefile +++ b/examples/app/Makefile @@ -1,4 +1,4 @@ -all: App15.pgf +all: App16.pgf PROBSFILE=./app.probs GFODIR=./gfos @@ -57,6 +57,7 @@ AppHin.pgf:: ; $(GFMKT) -name=AppHin AppHin.gf AppFre.pgf:: ; $(GFMKT) -name=AppFre AppFre.gf +RTS -K64M AppIta.pgf:: ; $(GFMKT) -name=AppIta AppIta.gf +RTS -K64M AppJpn.pgf:: ; $(GFMKT) -name=AppJpn AppJpn.gf +RTS -K64M +AppRus.pgf:: ; $(GFMKT) -name=AppRus AppRus.gf +RTS -K64M AppSpa.pgf:: ; $(GFMKT) -name=AppSpa AppSpa.gf +RTS -K64M AppSwe.pgf:: ; $(GFMKT) -name=AppSwe AppSwe.gf AppTha.pgf:: ; $(GFMKT) -name=AppTha AppTha.gf