From f47b1a748718a9aefb03b9bfbe5330dfe9a35c03 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 23 Jun 2008 12:59:26 +0000 Subject: [PATCH] more demo languages; an entry for demo in Make.hs --- lib/resource-1.4/Make.hs | 9 ++++++++- lib/resource-1.4/catalan/NumeralCat.gf | 2 +- lib/resource-1.4/demo/Clause.gf | 4 ++-- lib/resource-1.4/demo/ClauseCat.gf | 1 + lib/resource-1.4/demo/ClauseDan.gf | 1 + lib/resource-1.4/demo/ClauseI.gf | 4 ++-- lib/resource-1.4/demo/ClauseNor.gf | 1 + lib/resource-1.4/demo/ClauseRus.gf | 1 + lib/resource-1.4/demo/ClauseSpa.gf | 1 + lib/resource-1.4/demo/DemoCat.gf | 23 +++++++++++++++++++++++ lib/resource-1.4/demo/DemoDan.gf | 23 +++++++++++++++++++++++ lib/resource-1.4/demo/DemoNor.gf | 23 +++++++++++++++++++++++ lib/resource-1.4/demo/DemoRus.gf | 23 +++++++++++++++++++++++ lib/resource-1.4/demo/DemoSpa.gf | 23 +++++++++++++++++++++++ 14 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 lib/resource-1.4/demo/ClauseCat.gf create mode 100644 lib/resource-1.4/demo/ClauseDan.gf create mode 100644 lib/resource-1.4/demo/ClauseNor.gf create mode 100644 lib/resource-1.4/demo/ClauseRus.gf create mode 100644 lib/resource-1.4/demo/ClauseSpa.gf create mode 100644 lib/resource-1.4/demo/DemoCat.gf create mode 100644 lib/resource-1.4/demo/DemoDan.gf create mode 100644 lib/resource-1.4/demo/DemoNor.gf create mode 100644 lib/resource-1.4/demo/DemoRus.gf create mode 100644 lib/resource-1.4/demo/DemoSpa.gf diff --git a/lib/resource-1.4/Make.hs b/lib/resource-1.4/Make.hs index 61d1901d3..a83e06ee0 100644 --- a/lib/resource-1.4/Make.hs +++ b/lib/resource-1.4/Make.hs @@ -3,7 +3,7 @@ module Main where import System -- Make commands for compiling and testing resource grammars. --- usage: runghc Make present? (lang | api | math | pgf | test | clean)? +-- usage: runghc Make present? (lang | api | math | pgf | test | demo | clean)? -- With no argument, lang and api are done, in this order. -- See 'make' below for what is done by which command. @@ -38,6 +38,9 @@ langsMath = langsAPI -- languages for which to run treebank test langsTest = langsLang `except` ["Bul","Cat","Hin","Rus","Spa","Tha"] +-- languages for which to run demo test +langsDemo = langsLang `except` ["Bul","Hin","Ina","Rus","Tha"] ---- fix utf8 for Bul,Rus + -- languages for which langs.pgf is built langsPGF = langsTest `only` ["Eng","Fre","Swe"] @@ -70,6 +73,8 @@ make xx = do " +RTS -K100M" ifxx "test" $ do gf treeb $ unwords [dir ++ "/Lang" ++ la ++ ".gfo" | (_,la) <- langsTest] + ifxx "demo" $ do + gf demos $ unwords ["demo/Demo" ++ la ++ ".gf" | (_,la) <- langsDemo] ifxx "clean" $ do system "rm */*.gfo ../alltenses/*.gfo ../present/*.gfo" return () @@ -87,6 +92,8 @@ gf comm file = do treeb = "rf -lines -tree -file=" ++ treebankExx ++ " | l -treebank | wf -file=" ++ treebankResults +demos = "gr -number=100 | l -treebank | ps -to_utf8 -to_html | wf -file=resdemo.html" + lang (lla,la) = lla ++ "/Lang" ++ la ++ ".gf" try (lla,la) = "api/Try" ++ la ++ ".gf" math (lla,la) = "mathematical/Mathematical" ++ la ++ ".gf" diff --git a/lib/resource-1.4/catalan/NumeralCat.gf b/lib/resource-1.4/catalan/NumeralCat.gf index 7a2dcb289..5cbc15c02 100644 --- a/lib/resource-1.4/catalan/NumeralCat.gf +++ b/lib/resource-1.4/catalan/NumeralCat.gf @@ -21,7 +21,7 @@ oper Pl => case co of { NCard Masc => "-cents" ; NCard Fem => "-centes" ; - _ => variants {} } ; + _ => "-cents" ; ---- variants {} } ; ---- AR 23/6/2008 Sg => "cent" } ; cardOrd1 : CardOrd -> (_,_,_:Str) -> Str = \co,dos,dues,segon -> case co of { diff --git a/lib/resource-1.4/demo/Clause.gf b/lib/resource-1.4/demo/Clause.gf index 49f711380..5c0ccb0a7 100644 --- a/lib/resource-1.4/demo/Clause.gf +++ b/lib/resource-1.4/demo/Clause.gf @@ -10,12 +10,12 @@ fun QuestV : IP -> V -> QCl ; QuestV2 : IP -> V2 -> NP -> QCl ; - QuestV2Slash : IP -> NP -> V2 -> QCl ; +-- QuestV2Slash : IP -> NP -> V2 -> QCl ; UseQCl : Tense -> Ant -> Pol -> QCl -> QS ; ImpV : V -> Imp ; - ImpV2 : V2 -> NP -> Imp ; +-- ImpV2 : V2 -> NP -> Imp ; } diff --git a/lib/resource-1.4/demo/ClauseCat.gf b/lib/resource-1.4/demo/ClauseCat.gf new file mode 100644 index 000000000..11ab972db --- /dev/null +++ b/lib/resource-1.4/demo/ClauseCat.gf @@ -0,0 +1 @@ +concrete ClauseCat of Clause = CatCat ** ClauseI with (Grammar = GrammarCat) ; diff --git a/lib/resource-1.4/demo/ClauseDan.gf b/lib/resource-1.4/demo/ClauseDan.gf new file mode 100644 index 000000000..9297b86c3 --- /dev/null +++ b/lib/resource-1.4/demo/ClauseDan.gf @@ -0,0 +1 @@ +concrete ClauseDan of Clause = CatDan ** ClauseI with (Grammar = GrammarDan) ; diff --git a/lib/resource-1.4/demo/ClauseI.gf b/lib/resource-1.4/demo/ClauseI.gf index 309af322c..c42da9cc6 100644 --- a/lib/resource-1.4/demo/ClauseI.gf +++ b/lib/resource-1.4/demo/ClauseI.gf @@ -10,11 +10,11 @@ lin QuestV np v = QuestVP np (UseV v) ; QuestV2 s v o = QuestVP s (ComplSlash (SlashV2a v) o) ; - QuestV2Slash ip s v = QuestSlash ip (SlashVP s (SlashV2a v)) ; +-- QuestV2Slash ip s v = QuestSlash ip (SlashVP s (SlashV2a v)) ; UseQCl = Grammar.UseQCl ; ImpV v = ImpVP (UseV v) ; - ImpV2 v o = ImpVP (ComplSlash (SlashV2a v) o) ; +-- ImpV2 v o = ImpVP (ComplSlash (SlashV2a v) o) ; } diff --git a/lib/resource-1.4/demo/ClauseNor.gf b/lib/resource-1.4/demo/ClauseNor.gf new file mode 100644 index 000000000..26d71f76a --- /dev/null +++ b/lib/resource-1.4/demo/ClauseNor.gf @@ -0,0 +1 @@ +concrete ClauseNor of Clause = CatNor ** ClauseI with (Grammar = GrammarNor) ; diff --git a/lib/resource-1.4/demo/ClauseRus.gf b/lib/resource-1.4/demo/ClauseRus.gf new file mode 100644 index 000000000..380b38e15 --- /dev/null +++ b/lib/resource-1.4/demo/ClauseRus.gf @@ -0,0 +1 @@ +concrete ClauseRus of Clause = CatRus ** ClauseI with (Grammar = GrammarRus) ; diff --git a/lib/resource-1.4/demo/ClauseSpa.gf b/lib/resource-1.4/demo/ClauseSpa.gf new file mode 100644 index 000000000..4723fa77f --- /dev/null +++ b/lib/resource-1.4/demo/ClauseSpa.gf @@ -0,0 +1 @@ +concrete ClauseSpa of Clause = CatSpa ** ClauseI with (Grammar = GrammarSpa) ; diff --git a/lib/resource-1.4/demo/DemoCat.gf b/lib/resource-1.4/demo/DemoCat.gf new file mode 100644 index 000000000..b635ba16b --- /dev/null +++ b/lib/resource-1.4/demo/DemoCat.gf @@ -0,0 +1,23 @@ +--# -path=.:alltenses + +concrete DemoCat of Demo = + NounCat - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], +-- VerbCat, + ClauseCat, -- + AdjectiveCat - [SentAP], + AdverbCat, + NumeralCat, +---- SentenceCat, +---- QuestionCat, +---- RelativeCat, +---- ConjunctionCat, +---- PhraseCat, +---- TextX - [Tense,TPres,TPast,TFut,TCond], +---- IdiomCat, + StructuralCat, + LexiconCat + ** { + +flags startcat = Phr ; unlexer = text ; lexer = text ; + +} ; diff --git a/lib/resource-1.4/demo/DemoDan.gf b/lib/resource-1.4/demo/DemoDan.gf new file mode 100644 index 000000000..6262fef81 --- /dev/null +++ b/lib/resource-1.4/demo/DemoDan.gf @@ -0,0 +1,23 @@ +--# -path=.:alltenses + +concrete DemoDan of Demo = + NounDan - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], +-- VerbDan, + ClauseDan, -- + AdjectiveDan - [SentAP], + AdverbDan, + NumeralDan, +---- SentenceDan, +---- QuestionDan, +---- RelativeDan, +---- ConjunctionDan, +---- PhraseDan, +---- TextX - [Tense,TPres,TPast,TFut,TCond], +---- IdiomDan, + StructuralDan, + LexiconDan + ** { + +flags startcat = Phr ; unlexer = text ; lexer = text ; + +} ; diff --git a/lib/resource-1.4/demo/DemoNor.gf b/lib/resource-1.4/demo/DemoNor.gf new file mode 100644 index 000000000..306e76594 --- /dev/null +++ b/lib/resource-1.4/demo/DemoNor.gf @@ -0,0 +1,23 @@ +--# -path=.:alltenses + +concrete DemoNor of Demo = + NounNor - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], +-- VerbNor, + ClauseNor, -- + AdjectiveNor - [SentAP], + AdverbNor, + NumeralNor, +---- SentenceNor, +---- QuestionNor, +---- RelativeNor, +---- ConjunctionNor, +---- PhraseNor, +---- TextX - [Tense,TPres,TPast,TFut,TCond], +---- IdiomNor, + StructuralNor, + LexiconNor + ** { + +flags startcat = Phr ; unlexer = text ; lexer = text ; + +} ; diff --git a/lib/resource-1.4/demo/DemoRus.gf b/lib/resource-1.4/demo/DemoRus.gf new file mode 100644 index 000000000..e6f6596a6 --- /dev/null +++ b/lib/resource-1.4/demo/DemoRus.gf @@ -0,0 +1,23 @@ +--# -path=.:alltenses + +concrete DemoRus of Demo = + NounRus - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], +-- VerbRus, + ClauseRus, -- + AdjectiveRus - [SentAP], + AdverbRus, + NumeralRus, +---- SentenceRus, +---- QuestionRus, +---- RelativeRus, +---- ConjunctionRus, +---- PhraseRus, +---- TextX - [Tense,TPres,TPast,TFut,TCond], +---- IdiomRus, + StructuralRus, + LexiconRus + ** { + +flags startcat = Phr ; unlexer = text ; lexer = text ; + +} ; diff --git a/lib/resource-1.4/demo/DemoSpa.gf b/lib/resource-1.4/demo/DemoSpa.gf new file mode 100644 index 000000000..d772ce6f5 --- /dev/null +++ b/lib/resource-1.4/demo/DemoSpa.gf @@ -0,0 +1,23 @@ +--# -path=.:alltenses + +concrete DemoSpa of Demo = + NounSpa - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], +-- VerbSpa, + ClauseSpa, -- + AdjectiveSpa - [SentAP], + AdverbSpa, + NumeralSpa, +---- SentenceSpa, +---- QuestionSpa, +---- RelativeSpa, +---- ConjunctionSpa, +---- PhraseSpa, +---- TextX - [Tense,TPres,TPast,TFut,TCond], +---- IdiomSpa, + StructuralSpa, + LexiconSpa + ** { + +flags startcat = Phr ; unlexer = text ; lexer = text ; + +} ;