summaryrefslogtreecommitdiff
path: root/examples/app
diff options
context:
space:
mode:
Diffstat (limited to 'examples/app')
-rw-r--r--examples/app/App.gf16
-rw-r--r--examples/app/AppBul.gf2
-rw-r--r--examples/app/AppCat.gf2
-rw-r--r--examples/app/AppChi.gf2
-rw-r--r--examples/app/AppDut.gf2
-rw-r--r--examples/app/AppEng.gf22
-rw-r--r--examples/app/AppEst.gf2
-rw-r--r--examples/app/AppFin.gf2
-rw-r--r--examples/app/AppFre.gf2
-rw-r--r--examples/app/AppGer.gf2
-rw-r--r--examples/app/AppHin.gf2
-rw-r--r--examples/app/AppIta.gf2
-rw-r--r--examples/app/AppJpn.gf2
-rw-r--r--examples/app/AppRus.gf2
-rw-r--r--examples/app/AppSpa.gf2
-rw-r--r--examples/app/AppSwe.gf2
-rw-r--r--examples/app/AppTha.gf2
-rw-r--r--examples/app/Makefile2
-rw-r--r--examples/app/MkApp.hs4
19 files changed, 36 insertions, 38 deletions
diff --git a/examples/app/App.gf b/examples/app/App.gf
index 4ac4e112a..6414d0744 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -22,7 +22,7 @@ abstract App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,Phrasebook
+--P ,Phrasebook
** {
flags
@@ -30,19 +30,17 @@ flags
heuristic_search_factor=0.80; -- doesn't seem to affect speed or quality much
fun
- PhrasePhr : Phrase -> Phr ;
- Phrase_Chunk : Phrase -> Chunk ;
+--P PhrasePhr : Phrase -> Phr ;
+--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 ;
+-- ComplV2A : V2A -> NP -> AP -> VP ;
+-- ComplV2Q : V2Q -> NP -> QS -> VP ;
+-- ComplV2S : V2S -> NP -> S -> VP ;
+
ComplV3 : V3 -> NP -> NP -> VP ;
--}
}
diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf
index 874d2a6ca..d62fb4732 100644
--- a/examples/app/AppBul.gf
+++ b/examples/app/AppBul.gf
@@ -24,7 +24,7 @@ concrete AppBul of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
+ --P ,PhrasebookBul - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
** open ParadigmsBul, SyntaxBul, Prelude in {
diff --git a/examples/app/AppCat.gf b/examples/app/AppCat.gf
index 96b1c9ebb..d0d757154 100644
--- a/examples/app/AppCat.gf
+++ b/examples/app/AppCat.gf
@@ -25,7 +25,7 @@ concrete AppCat of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
+ --P ,PhrasebookCat - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
** open ParadigmsCat, SyntaxCat, Prelude in {
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index c4dda6218..8abffcc0c 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -24,7 +24,7 @@ concrete AppChi of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
+ --P ,PhrasebookChi - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
** open ParadigmsChi, SyntaxChi, Prelude in {
diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf
index 62768a9ef..eba751d20 100644
--- a/examples/app/AppDut.gf
+++ b/examples/app/AppDut.gf
@@ -24,7 +24,7 @@ concrete AppDut of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
+--P ,PhrasebookDut - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
** open ParadigmsDut, SyntaxDut, Prelude in {
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 ;
+
}
diff --git a/examples/app/AppEst.gf b/examples/app/AppEst.gf
index dd4111f50..ab1d256e0 100644
--- a/examples/app/AppEst.gf
+++ b/examples/app/AppEst.gf
@@ -24,7 +24,7 @@ concrete AppEst of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookEst - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
+ --P ,PhrasebookEst - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
** open ParadigmsEst, SyntaxEst, Prelude in {
diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf
index 85abd8696..c086c1e6e 100644
--- a/examples/app/AppFin.gf
+++ b/examples/app/AppFin.gf
@@ -24,7 +24,7 @@ concrete AppFin of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
+--P ,PhrasebookFin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, open_Adv]
** open ParadigmsFin, SyntaxFin, Prelude in {
diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf
index ad3acf0ad..4e83c0ffd 100644
--- a/examples/app/AppFre.gf
+++ b/examples/app/AppFre.gf
@@ -22,7 +22,7 @@ concrete AppFre of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
+ --P ,PhrasebookFre - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
** open ParadigmsFre, SyntaxFre, Prelude in {
diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf
index 858766f77..f607303c7 100644
--- a/examples/app/AppGer.gf
+++ b/examples/app/AppGer.gf
@@ -24,7 +24,7 @@ concrete AppGer of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
+--P ,PhrasebookGer - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
** open ParadigmsGer, SyntaxGer, Prelude in {
diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf
index e76fe0e91..8f8edb773 100644
--- a/examples/app/AppHin.gf
+++ b/examples/app/AppHin.gf
@@ -23,7 +23,7 @@ concrete AppHin of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
+ --P ,PhrasebookHin - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
** open ParadigmsHin, SyntaxHin, Prelude in {
diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf
index e1a31ca0b..5aec6b376 100644
--- a/examples/app/AppIta.gf
+++ b/examples/app/AppIta.gf
@@ -24,7 +24,7 @@ concrete AppIta of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
+ --P ,PhrasebookIta - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_A, closed_A]
** open ParadigmsIta, SyntaxIta, Prelude in {
diff --git a/examples/app/AppJpn.gf b/examples/app/AppJpn.gf
index 1e5fde5af..cfe61cc90 100644
--- a/examples/app/AppJpn.gf
+++ b/examples/app/AppJpn.gf
@@ -24,7 +24,7 @@ concrete AppJpn of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
+ --P ,PhrasebookJpn ---- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
** open ParadigmsJpn, SyntaxJpn, Prelude in {
diff --git a/examples/app/AppRus.gf b/examples/app/AppRus.gf
index febe603ff..a64498426 100644
--- a/examples/app/AppRus.gf
+++ b/examples/app/AppRus.gf
@@ -24,7 +24,7 @@ concrete AppRus of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookRus - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, cost_V]
+--P ,PhrasebookRus - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, cost_V]
** open ParadigmsRus, SyntaxRus, Prelude in {
diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index e1a970461..842d230ae 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -25,7 +25,7 @@ concrete AppSpa of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
+ --P ,PhrasebookSpa - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, cheap_A,expensive_A, open_A, closed_A]
** open ParadigmsSpa, SyntaxSpa, Prelude in {
diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf
index 5740e8b48..591f55f41 100644
--- a/examples/app/AppSwe.gf
+++ b/examples/app/AppSwe.gf
@@ -23,7 +23,7 @@ concrete AppSwe of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
+ --P ,PhrasebookSwe - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A]
** open MorphoSwe, ResSwe, ParadigmsSwe, SyntaxSwe, CommonScand, (E = ExtraSwe), Prelude in {
diff --git a/examples/app/AppTha.gf b/examples/app/AppTha.gf
index b4726a9f9..c2f8c2bb7 100644
--- a/examples/app/AppTha.gf
+++ b/examples/app/AppTha.gf
@@ -24,7 +24,7 @@ concrete AppTha of App =
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
- ,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
+ --P ,PhrasebookTha - [at_Prep, closed_A, open_A] --- - [PSentence, PQuestion, PGreetingMale, PGreetingFemale, GObjectPlease, open_Adv, closed_A, open_A, at_Prep, by_Prep]
** open ParadigmsTha, SyntaxTha, Prelude in {
diff --git a/examples/app/Makefile b/examples/app/Makefile
index d556ebdf5..feedab8c9 100644
--- a/examples/app/Makefile
+++ b/examples/app/Makefile
@@ -1,4 +1,4 @@
-all: Phrasebook App15.pgf
+all: App15.pgf
PROBSFILE=./app.probs
GFODIR=./gfos
diff --git a/examples/app/MkApp.hs b/examples/app/MkApp.hs
index e1a655c22..2537b1cc5 100644
--- a/examples/app/MkApp.hs
+++ b/examples/app/MkApp.hs
@@ -3,7 +3,7 @@
-- the new files are produced in ./tmp/ which has to be created first
-- usage: runghc MkApp.hs
-langs = words "Bul Cat Chi Dut Eng Fin Fre Ger Hin Ita Jpn Spa Swe Tha"
+langs = words "Bul Cat Chi Dut Eng Est Fin Fre Ger Hin Ita Jpn Spa Swe Tha"
appCnc lang = "App" ++ lang ++ ".gf"
appAbs = "App.gf"
@@ -23,5 +23,5 @@ putImports i s =
extra s = unlines (init (lines s) ++ extraLines ++ ["}"])
extraLines = [
- " PassV2 v2 = passiveVP v2 ;"
+-- " PassV2 v2 = passiveVP v2 ;"
] -- default: no extra