From a8fcbef85098bb77374e4393e32a99409f154b42 Mon Sep 17 00:00:00 2001 From: aarne Date: Fri, 18 Oct 2013 12:17:52 +0000 Subject: [PATCH] Added Est to resource demo. Also have_V2 which was missing in the demo. --- lib/src/demo/Makefile | 4 ++-- lib/src/demo/MkMini.hs | 6 +++--- lib/src/demo/ResourceDemo.gf | 3 ++- lib/src/demo/ResourceDemoEng.gf | 3 ++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile index ea27dbeb8..dc76d930e 100644 --- a/lib/src/demo/Makefile +++ b/lib/src/demo/Makefile @@ -6,7 +6,7 @@ src: runghc MkMini.hs compdemo: - $(compile) Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd linkdemo: - $(compile) -link Afr Bul Cat Chi Dan Dut Eng Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + $(compile) -link Afr Bul Cat Chi Dan Dut Eng Est Fin Fre Ger Gre Hin Ita Jpn Lav Mlt Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd diff --git a/lib/src/demo/MkMini.hs b/lib/src/demo/MkMini.hs index d90353f09..29fe3ec71 100644 --- a/lib/src/demo/MkMini.hs +++ b/lib/src/demo/MkMini.hs @@ -1,9 +1,9 @@ src = "Eng" langs = [ "Afr","Bul","Cat","Chi","Dan","Dut", - "Fin","Fre","Ger","Gre","Hin","Ita", - "Jpn","Lav","Mlt","Nep","Nor","Pes", - "Pol","Pnb","Ron","Rus","Snd", + "Est","Fin","Fre","Ger","Gre","Hin", + "Ita","Jpn","Lav","Mlt","Nep","Nor", + "Pes","Pol","Pnb","Ron","Rus","Snd", "Spa","Swe","Tha","Urd" ] diff --git a/lib/src/demo/ResourceDemo.gf b/lib/src/demo/ResourceDemo.gf index 809eb00ea..a9985b7a9 100644 --- a/lib/src/demo/ResourceDemo.gf +++ b/lib/src/demo/ResourceDemo.gf @@ -111,7 +111,8 @@ abstract ResourceDemo = Lexicon, Numeral, Grammar [ by_Prep, in_Prep, of_Prep, with_Prep, -- Prep, can_VV, must_VV, want_VV, -- VV, although_Subj, because_Subj, when_Subj, if_Subj, -- Subj, - when_IAdv, where_IAdv, why_IAdv-- IAdv, + when_IAdv, where_IAdv, why_IAdv, -- IAdv, + have_V2 ] ** { diff --git a/lib/src/demo/ResourceDemoEng.gf b/lib/src/demo/ResourceDemoEng.gf index cace07dc2..cf1e079a9 100644 --- a/lib/src/demo/ResourceDemoEng.gf +++ b/lib/src/demo/ResourceDemoEng.gf @@ -118,7 +118,8 @@ concrete ResourceDemoEng of ResourceDemo = LexiconEng, NumeralEng, GrammarEng [ by_Prep, in_Prep, of_Prep, with_Prep, -- Prep, can_VV, must_VV, want_VV, -- VV, although_Subj, because_Subj, when_Subj, if_Subj, -- Subj, - when_IAdv, where_IAdv, why_IAdv-- IAdv, + when_IAdv, where_IAdv, why_IAdv, -- IAdv, + have_V2 ] ** open SyntaxEng, (S = SyntaxEng) in {