diff --git a/lib/src/mini/Compile.hs b/lib/src/demo/Compile.hs similarity index 98% rename from lib/src/mini/Compile.hs rename to lib/src/demo/Compile.hs index 84d7f6514..984c5e066 100644 --- a/lib/src/mini/Compile.hs +++ b/lib/src/demo/Compile.hs @@ -18,7 +18,7 @@ import System -- change this to apply to another project; alternatively, just use full file names -mainmodu = "MiniGrammar" +mainmodu = "ResourceDemo" main = do (opts,langs) <- getArgs >>= return . partition ((=='-') . head) diff --git a/lib/src/demo/Makefile b/lib/src/demo/Makefile new file mode 100644 index 000000000..9e96a103d --- /dev/null +++ b/lib/src/demo/Makefile @@ -0,0 +1,12 @@ +compile = runghc Compile + +all: src compdemo linkdemo + +src: + runghc MkMini.hs + +compdemo: + $(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd + +linkdemo: + $(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Jap Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd diff --git a/lib/src/mini/MkMini.hs b/lib/src/demo/MkMini.hs similarity index 70% rename from lib/src/mini/MkMini.hs rename to lib/src/demo/MkMini.hs index a055f0439..877f9da11 100644 --- a/lib/src/mini/MkMini.hs +++ b/lib/src/demo/MkMini.hs @@ -2,12 +2,12 @@ src = "Eng" langs = [ "Afr","Bul","Cat","Dan","Dut", "Fin","Fre","Ger","Hin","Ita", - "Lav","Nep","Nor","Pes","Pol", - "Pnb","Ron","Rus","Snd","Spa", - "Swe","Tha","Urd" + "Jap","Lav","Nep","Nor","Pes", + "Pol","Pnb","Ron","Rus","Snd", + "Spa","Swe","Tha","Urd" ] -file lng = "MiniGrammar" ++ lng ++ ".gf" +file lng = "ResourceDemo" ++ lng ++ ".gf" main = do s <- readFile (file src) diff --git a/lib/src/mini/MiniGrammar.gf b/lib/src/demo/ResourceDemo.gf similarity index 98% rename from lib/src/mini/MiniGrammar.gf rename to lib/src/demo/ResourceDemo.gf index 5cedeed3c..953848819 100644 --- a/lib/src/mini/MiniGrammar.gf +++ b/lib/src/demo/ResourceDemo.gf @@ -1,4 +1,4 @@ -abstract MiniGrammar = Lexicon, Grammar [ +abstract ResourceDemo = Lexicon, Grammar [ -- the "mini" resource of GF book, chapter 9 diff --git a/lib/src/mini/MiniGrammarEng.gf b/lib/src/demo/ResourceDemoEng.gf similarity index 98% rename from lib/src/mini/MiniGrammarEng.gf rename to lib/src/demo/ResourceDemoEng.gf index 8280dbcca..6340ac439 100644 --- a/lib/src/mini/MiniGrammarEng.gf +++ b/lib/src/demo/ResourceDemoEng.gf @@ -1,6 +1,6 @@ --# -path=.:alltenses -concrete MiniGrammarEng of MiniGrammar = LexiconEng, GrammarEng [ +concrete ResourceDemoEng of ResourceDemo = LexiconEng, GrammarEng [ -- the "mini" resource of GF book, chapter 9 diff --git a/lib/src/mini/Makefile b/lib/src/mini/Makefile deleted file mode 100644 index b36074303..000000000 --- a/lib/src/mini/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -compile = runghc Compile - -all: src compdemo linkdemo - -src: - runghc MkMini.hs - -compdemo: - $(compile) Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd - -linkdemo: - $(compile) -link Afr Bul Cat Dan Dut Eng Fin Fre Ger Hin Ita Lav Nep Nor Pes Pnb Pol Ron Rus Snd Spa Swe Tha Urd diff --git a/lib/src/demo/Demo.gf b/lib/src/old-demo/Demo.gf similarity index 100% rename from lib/src/demo/Demo.gf rename to lib/src/old-demo/Demo.gf diff --git a/lib/src/demo/DemoAra.gf b/lib/src/old-demo/DemoAra.gf similarity index 100% rename from lib/src/demo/DemoAra.gf rename to lib/src/old-demo/DemoAra.gf diff --git a/lib/src/demo/DemoBul.gf b/lib/src/old-demo/DemoBul.gf similarity index 100% rename from lib/src/demo/DemoBul.gf rename to lib/src/old-demo/DemoBul.gf diff --git a/lib/src/demo/DemoCat.gf b/lib/src/old-demo/DemoCat.gf similarity index 100% rename from lib/src/demo/DemoCat.gf rename to lib/src/old-demo/DemoCat.gf diff --git a/lib/src/demo/DemoDan.gf b/lib/src/old-demo/DemoDan.gf similarity index 100% rename from lib/src/demo/DemoDan.gf rename to lib/src/old-demo/DemoDan.gf diff --git a/lib/src/demo/DemoDut.gf b/lib/src/old-demo/DemoDut.gf similarity index 100% rename from lib/src/demo/DemoDut.gf rename to lib/src/old-demo/DemoDut.gf diff --git a/lib/src/demo/DemoEng.gf b/lib/src/old-demo/DemoEng.gf similarity index 100% rename from lib/src/demo/DemoEng.gf rename to lib/src/old-demo/DemoEng.gf diff --git a/lib/src/demo/DemoFin.gf b/lib/src/old-demo/DemoFin.gf similarity index 100% rename from lib/src/demo/DemoFin.gf rename to lib/src/old-demo/DemoFin.gf diff --git a/lib/src/demo/DemoFre.gf b/lib/src/old-demo/DemoFre.gf similarity index 100% rename from lib/src/demo/DemoFre.gf rename to lib/src/old-demo/DemoFre.gf diff --git a/lib/src/demo/DemoGer.gf b/lib/src/old-demo/DemoGer.gf similarity index 100% rename from lib/src/demo/DemoGer.gf rename to lib/src/old-demo/DemoGer.gf diff --git a/lib/src/demo/DemoHin.gf b/lib/src/old-demo/DemoHin.gf similarity index 100% rename from lib/src/demo/DemoHin.gf rename to lib/src/old-demo/DemoHin.gf diff --git a/lib/src/demo/DemoIna.gf b/lib/src/old-demo/DemoIna.gf similarity index 100% rename from lib/src/demo/DemoIna.gf rename to lib/src/old-demo/DemoIna.gf diff --git a/lib/src/demo/DemoIta.gf b/lib/src/old-demo/DemoIta.gf similarity index 100% rename from lib/src/demo/DemoIta.gf rename to lib/src/old-demo/DemoIta.gf diff --git a/lib/src/demo/DemoLat.gf b/lib/src/old-demo/DemoLat.gf similarity index 100% rename from lib/src/demo/DemoLat.gf rename to lib/src/old-demo/DemoLat.gf diff --git a/lib/src/demo/DemoNor.gf b/lib/src/old-demo/DemoNor.gf similarity index 100% rename from lib/src/demo/DemoNor.gf rename to lib/src/old-demo/DemoNor.gf diff --git a/lib/src/demo/DemoPol.gf b/lib/src/old-demo/DemoPol.gf similarity index 100% rename from lib/src/demo/DemoPol.gf rename to lib/src/old-demo/DemoPol.gf diff --git a/lib/src/demo/DemoRon.gf b/lib/src/old-demo/DemoRon.gf similarity index 100% rename from lib/src/demo/DemoRon.gf rename to lib/src/old-demo/DemoRon.gf diff --git a/lib/src/demo/DemoRus.gf b/lib/src/old-demo/DemoRus.gf similarity index 100% rename from lib/src/demo/DemoRus.gf rename to lib/src/old-demo/DemoRus.gf diff --git a/lib/src/demo/DemoSpa.gf b/lib/src/old-demo/DemoSpa.gf similarity index 100% rename from lib/src/demo/DemoSpa.gf rename to lib/src/old-demo/DemoSpa.gf diff --git a/lib/src/demo/DemoSwe.gf b/lib/src/old-demo/DemoSwe.gf similarity index 100% rename from lib/src/demo/DemoSwe.gf rename to lib/src/old-demo/DemoSwe.gf diff --git a/lib/src/demo/DemoTha.gf b/lib/src/old-demo/DemoTha.gf similarity index 100% rename from lib/src/demo/DemoTha.gf rename to lib/src/old-demo/DemoTha.gf diff --git a/lib/src/demo/DemoTur.gf b/lib/src/old-demo/DemoTur.gf similarity index 100% rename from lib/src/demo/DemoTur.gf rename to lib/src/old-demo/DemoTur.gf diff --git a/lib/src/demo/DemoUrd.gf b/lib/src/old-demo/DemoUrd.gf similarity index 100% rename from lib/src/demo/DemoUrd.gf rename to lib/src/old-demo/DemoUrd.gf