Add a Generics module with a generic to_tuple function.

diff --git a/.ghci b/.ghci
index b3270630eb613fb2814a5c8b4c1962dcd0d69c81..9eb31fbdb44b103207058e5f85be8fbc1ab90c55 100644 (file)
--- 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 92290ae3e1dc3c5fefd28228fd02b4e79cf3a23b..19bad45a9857dbda72ea4c5265f20bc59a29289a 100644 (file)
--- 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 9bf2a64cb46be6e67f1ad2b7148ef4299bf4fc16..2b488e21b6c244a42becaf148124f698823ef612 100644 (file)
--- 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 af4bcb5085a7c5650db14a0c9bfc6434e1e3630e..b78ae0f6850194ffb9f9b178bdc0e31ff46331a7 100644 (file)
--- 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"]