summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authoraarne <aarne@chalmers.se>2017-04-11 15:48:18 +0000
committeraarne <aarne@chalmers.se>2017-04-11 15:48:18 +0000
commitdd61e1dc1988ebd056182c8e801894cfd427beee (patch)
treeb55cb2ea68578082c5008010c02e23b2bef45169 /examples
parent23f740d3b98b40a860addc2a7902b0976af4e6e8 (diff)
re-enabled Phrasebook in App ; added Russian ; testing with lower-casing the input
Diffstat (limited to 'examples')
-rw-r--r--examples/app/App.gf6
-rw-r--r--examples/app/AppBul.gf3
-rw-r--r--examples/app/AppCat.gf3
-rw-r--r--examples/app/AppChi.gf5
-rw-r--r--examples/app/AppDut.gf3
-rw-r--r--examples/app/AppEng.gf3
-rw-r--r--examples/app/AppEst.gf2
-rw-r--r--examples/app/AppFin.gf4
-rw-r--r--examples/app/AppFre.gf2
-rw-r--r--examples/app/AppFunctor.gf7
-rw-r--r--examples/app/AppGer.gf4
-rw-r--r--examples/app/AppHin.gf4
-rw-r--r--examples/app/AppIta.gf2
-rw-r--r--examples/app/AppJpn.gf4
-rw-r--r--examples/app/AppRus.gf2
-rw-r--r--examples/app/AppSpa.gf2
-rw-r--r--examples/app/AppSwe.gf3
-rw-r--r--examples/app/AppTha.gf4
-rw-r--r--examples/app/Makefile4
-rw-r--r--examples/phrasebook/Makefile2
20 files changed, 51 insertions, 18 deletions
diff --git a/examples/app/App.gf b/examples/app/App.gf
index a2947361e..cfd56bb4c 100644
--- a/examples/app/App.gf
+++ b/examples/app/App.gf
@@ -22,7 +22,7 @@ abstract App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
---P ,Phrasebook
+ ,Phrasebook
** {
flags
@@ -30,8 +30,8 @@ flags
heuristic_search_factor=0.80; -- doesn't seem to affect speed or quality much
fun
---P PhrasePhr : Phrase -> Phr ;
---P Phrase_Chunk : Phrase -> Chunk ;
+ PhrasePhr : Phrase -> Phr ;
+ Phrase_Chunk : Phrase -> Chunk ;
ComplV2 : V2 -> NP -> VP ; -- sees him
diff --git a/examples/app/AppBul.gf b/examples/app/AppBul.gf
index a447fdc48..409a61a54 100644
--- a/examples/app/AppBul.gf
+++ b/examples/app/AppBul.gf
@@ -22,7 +22,8 @@ concrete AppBul of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookBul - [open_Adv,closed_A,open_A]
** AppFunctor with (Syntax = SyntaxBul) ;
diff --git a/examples/app/AppCat.gf b/examples/app/AppCat.gf
index 5f4580cab..7ad0f2608 100644
--- a/examples/app/AppCat.gf
+++ b/examples/app/AppCat.gf
@@ -23,5 +23,6 @@ concrete AppCat of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
-
+ ,PhrasebookCat - [open_Adv,closed_A,open_A,at_Prep,cheap_A,expensive_A,stateCopula]
+
** AppFunctor with (Syntax = SyntaxCat) ;
diff --git a/examples/app/AppChi.gf b/examples/app/AppChi.gf
index a24aa2df8..0dc316d53 100644
--- a/examples/app/AppChi.gf
+++ b/examples/app/AppChi.gf
@@ -22,6 +22,7 @@ concrete AppChi of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
-
+ ],
+ PhrasebookChi - [open_Adv,closed_A,open_A,at_Prep,by_Prep]
+
** AppFunctor with (Syntax = SyntaxChi) ;
diff --git a/examples/app/AppDut.gf b/examples/app/AppDut.gf
index 27b88b4b6..de4e7e81b 100644
--- a/examples/app/AppDut.gf
+++ b/examples/app/AppDut.gf
@@ -22,6 +22,7 @@ concrete AppDut of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookDut - [open_Adv,closed_A,open_A]
** AppFunctor with (Syntax = SyntaxDut) ;
diff --git a/examples/app/AppEng.gf b/examples/app/AppEng.gf
index 2317a6023..6b06f12b9 100644
--- a/examples/app/AppEng.gf
+++ b/examples/app/AppEng.gf
@@ -22,7 +22,8 @@ concrete AppEng of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookEng - [open_Adv]
** AppFunctor with (Syntax = SyntaxEng) ;
diff --git a/examples/app/AppEst.gf b/examples/app/AppEst.gf
index b7986172e..a8d52623f 100644
--- a/examples/app/AppEst.gf
+++ b/examples/app/AppEst.gf
@@ -23,5 +23,7 @@ concrete AppEst of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
+ ,PhrasebookEst - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxEst) ;
diff --git a/examples/app/AppFin.gf b/examples/app/AppFin.gf
index 43e1bfc20..f09c9ca94 100644
--- a/examples/app/AppFin.gf
+++ b/examples/app/AppFin.gf
@@ -22,6 +22,8 @@ concrete AppFin of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookFin - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxFin) ;
diff --git a/examples/app/AppFre.gf b/examples/app/AppFre.gf
index 5ecf3c24a..b20158e4a 100644
--- a/examples/app/AppFre.gf
+++ b/examples/app/AppFre.gf
@@ -22,5 +22,7 @@ concrete AppFre of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
+ ,PhrasebookFre - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxFre) ;
diff --git a/examples/app/AppFunctor.gf b/examples/app/AppFunctor.gf
index 660f1ed57..e2b332151 100644
--- a/examples/app/AppFunctor.gf
+++ b/examples/app/AppFunctor.gf
@@ -20,14 +20,19 @@ incomplete concrete AppFunctor of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ Phrasebook - [open_Adv]
** open Syntax in {
flags
literal=Symb ;
+ case_sensitive=off ;
lin
+ PhrasePhr p = {s = "+" ++ p.s} | p ;
+ Phrase_Chunk p = p ;
+
ComplV2 v np = mkVP v np ;
ComplV2V v np vp = mkVP v np vp ;
diff --git a/examples/app/AppGer.gf b/examples/app/AppGer.gf
index 5196865d6..c4b779e23 100644
--- a/examples/app/AppGer.gf
+++ b/examples/app/AppGer.gf
@@ -22,6 +22,8 @@ concrete AppGer of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookGer - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxGer) ;
diff --git a/examples/app/AppHin.gf b/examples/app/AppHin.gf
index 10443facb..fc68ed39b 100644
--- a/examples/app/AppHin.gf
+++ b/examples/app/AppHin.gf
@@ -22,6 +22,8 @@ concrete AppHin of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookHin - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxHin) ;
diff --git a/examples/app/AppIta.gf b/examples/app/AppIta.gf
index 53f3cddf4..97f12ab28 100644
--- a/examples/app/AppIta.gf
+++ b/examples/app/AppIta.gf
@@ -23,5 +23,7 @@ concrete AppIta of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
+ ,PhrasebookIta - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxIta) ;
diff --git a/examples/app/AppJpn.gf b/examples/app/AppJpn.gf
index 474c8e926..56819ec6d 100644
--- a/examples/app/AppJpn.gf
+++ b/examples/app/AppJpn.gf
@@ -22,6 +22,8 @@ concrete AppJpn of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookJpn - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxJpn) ;
diff --git a/examples/app/AppRus.gf b/examples/app/AppRus.gf
index 2539b2b1b..b347ed15f 100644
--- a/examples/app/AppRus.gf
+++ b/examples/app/AppRus.gf
@@ -23,5 +23,7 @@ concrete AppRus of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
+ ,PhrasebookRus - [open_Adv,closed_A,open_A,at_Prep,cost_V]
+
** AppFunctor with (Syntax = SyntaxRus) ;
diff --git a/examples/app/AppSpa.gf b/examples/app/AppSpa.gf
index a32378031..450573a02 100644
--- a/examples/app/AppSpa.gf
+++ b/examples/app/AppSpa.gf
@@ -24,5 +24,7 @@ concrete AppSpa of App =
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
]
+ ,PhrasebookSpa - [open_Adv,closed_A,open_A,at_Prep,cheap_A,expensive_A,stateCopula]
+
** AppFunctor with (Syntax = SyntaxSpa) ;
diff --git a/examples/app/AppSwe.gf b/examples/app/AppSwe.gf
index 87d4e9449..0a416c14a 100644
--- a/examples/app/AppSwe.gf
+++ b/examples/app/AppSwe.gf
@@ -21,6 +21,7 @@ concrete AppSwe of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookSwe - [open_Adv,closed_A,open_A]
** AppFunctor with (Syntax = SyntaxSwe) ;
diff --git a/examples/app/AppTha.gf b/examples/app/AppTha.gf
index 8c46afa8d..094bd5a40 100644
--- a/examples/app/AppTha.gf
+++ b/examples/app/AppTha.gf
@@ -22,7 +22,9 @@ concrete AppTha of App =
-- Construction
-- Extensions
PassVPSlash, PassAgentVPSlash -- not reachable anyway
- ]
+ ],
+ PhrasebookTha - [open_Adv,closed_A,open_A,at_Prep]
+
** AppFunctor with (Syntax = SyntaxTha) ;
diff --git a/examples/app/Makefile b/examples/app/Makefile
index 4af304a9e..67b0a3e6a 100644
--- a/examples/app/Makefile
+++ b/examples/app/Makefile
@@ -34,7 +34,7 @@ App16.pgf: $(APP16)
# Without dependencies:
App11:
- $(GFMKT) -name=App12 $(APP11) +RTS -K200M
+ $(GFMKT) -name=App11 $(APP11) +RTS -K200M
App12:
$(GFMKT) -name=App12 $(APP12) +RTS -K200M
App13:
@@ -43,6 +43,8 @@ App14:
$(GFMKT) -name=App14 $(APP14) +RTS -K200M
App15:
$(GFMKT) -name=App15 $(APP15) +RTS -K200M
+App16:
+ $(GFMKT) -name=App16 $(APP16) +RTS -K200M
# App grammars for individual languages
AppEng.pgf:: ; $(GFMKT) -name=AppEng AppEng.gf
diff --git a/examples/phrasebook/Makefile b/examples/phrasebook/Makefile
index 589737517..2f9a20f34 100644
--- a/examples/phrasebook/Makefile
+++ b/examples/phrasebook/Makefile
@@ -1,7 +1,7 @@
compile = runghc Compile
forApp:
- $(compile) -opt Bul Cat Chi Dut Eng Est Fin Fre Ger Hin Ita Jpn Spa Swe Tha
+ $(compile) -opt Bul Cat Chi Dut Eng Est Fin Fre Ger Hin Ita Jpn Rus Spa Swe Tha
make gfos
.PHONY: gfos