From 0c13a9f7630d82f8651371b31ee63b55b072ef8d Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 29 Dec 2014 15:05:49 -0500 Subject: [PATCH] Add a Generics module with a generic to_tuple function. --- .ghci | 2 ++ doc/TODO | 4 ++++ htsn-import.cabal | 4 ++++ test/Doctests.hs | 2 ++ 4 files changed, 12 insertions(+) diff --git a/.ghci b/.ghci index b327063..9eb31fb 100644 --- a/.ghci +++ b/.ghci @@ -8,6 +8,7 @@ src/Configuration.hs src/ConnectionString.hs src/ExitCodes.hs + src/Generics.hs src/OptionalConfiguration.hs src/TSN/Codegen.hs src/TSN/Database.hs @@ -42,6 +43,7 @@ import CommandLine import Configuration import ConnectionString import ExitCodes +import Generics import OptionalConfiguration import TSN.Codegen import TSN.Database diff --git a/doc/TODO b/doc/TODO index 92290ae..19bad45 100644 --- a/doc/TODO +++ b/doc/TODO @@ -57,3 +57,7 @@ the filename. 7. Combine test XML files where possible. + +8. Remove the -XDeriveGeneric argument in test/Doctests.hs; it + shouldn't be necessary if doctest picks up the LANGUAGE pragmas on its + own. diff --git a/htsn-import.cabal b/htsn-import.cabal index 9bf2a64..2b488e2 100644 --- a/htsn-import.cabal +++ b/htsn-import.cabal @@ -251,6 +251,7 @@ executable htsn-import hslogger >= 1.2, htsn-common >= 0.0.1, hxt >= 9.3, + generics-sop >= 0.1, groundhog >= 0.5, groundhog-postgresql >= 0.5, groundhog-sqlite >= 0.5, @@ -276,6 +277,7 @@ executable htsn-import Configuration ConnectionString ExitCodes + Generics OptionalConfiguration TSN.Codegen TSN.Database @@ -341,6 +343,7 @@ test-suite testsuite hslogger >= 1.2, htsn-common >= 0.0.1, hxt >= 9.3, + generics-sop >= 0.1, groundhog >= 0.5, groundhog-postgresql >= 0.5, groundhog-sqlite >= 0.5, @@ -410,6 +413,7 @@ test-suite shelltests configurator >= 0.2, directory >= 1.2, filepath >= 1.3, + generics-sop >= 0.1, hslogger >= 1.2, htsn-common >= 0.0.1, hxt >= 9.3, diff --git a/test/Doctests.hs b/test/Doctests.hs index af4bcb5..b78ae0f 100644 --- a/test/Doctests.hs +++ b/test/Doctests.hs @@ -9,5 +9,7 @@ import Test.DocTest ( doctest ) main :: IO () main = doctest [ "-isrc", "-idist/build/autogen", + "-XDeriveGeneric", --FIXME, shouldn't be needed. + "src/Generics.hs", "src/TSN/Codegen.hs", "src/TSN/Picklers.hs"] -- 2.43.2