X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FTSN%2FXML%2FOdds.hs;h=7eb759b79239721c4055cf933a58dc4dc612dbab;hb=8fd79929d4e139608ecde40fc70703e0efd56f30;hp=2bc52216148e6c173bec6bfb7f953de764c30d1d;hpb=c6d0a578213ecfadd1359ea0af2a59da189654b1;p=dead%2Fhtsn-import.git

diff --git a/src/TSN/XML/Odds.hs b/src/TSN/XML/Odds.hs
index 2bc5221..7eb759b 100644
--- a/src/TSN/XML/Odds.hs
+++ b/src/TSN/XML/Odds.hs
@@ -3,22 +3,18 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE TypeFamilies #-}
 
-module TSN.XML.Odds (
-  Odds,
-  Message,
-  odds_tests )
-where
-
-
 -- | Parse TSN XML for the DTD "Odds_XML.dtd". Each document contains
 --   a root element \<message\> that contains a bunch of other
 --   unorganized crap.
 --
+module TSN.XML.Odds (
+  odds_tests,
+  pickle_message )
+where
 
 import Control.Monad ( forM_ )
 import Data.Tuple.Curry ( uncurryN )
@@ -37,7 +33,6 @@ import Test.Tasty ( TestTree, testGroup )
 import Test.Tasty.HUnit ( (@?=), testCase )
 import Text.XML.HXT.Core (
   PU,
-  XmlPickler(..),
   xp5Tuple,
   xp6Tuple,
   xp8Tuple,
@@ -407,9 +402,6 @@ pickle_casino =
                                       xml_casino_name,
                                       xml_casino_line)
 
-instance XmlPickler OddsGameCasinoXml where
-  xpickle = pickle_casino
-
 
 pickle_home_team :: PU OddsGameHomeTeamXml
 pickle_home_team =
@@ -430,8 +422,6 @@ pickle_home_team =
                                         xml_home_team_name,
                                         xml_home_casinos)
 
-instance XmlPickler OddsGameHomeTeamXml where
-  xpickle = pickle_home_team
 
 
 pickle_away_team :: PU OddsGameAwayTeamXml
@@ -454,9 +444,6 @@ pickle_away_team =
                                  xml_away_casinos)
 
 
-instance XmlPickler OddsGameAwayTeamXml where
-  xpickle = pickle_away_team
-
 
 pickle_over_under :: PU OddsGameOverUnderXml
 pickle_over_under =
@@ -467,8 +454,6 @@ pickle_over_under =
     from_newtype (OddsGameOverUnderXml cs) = cs
     to_newtype = OddsGameOverUnderXml
 
-instance XmlPickler OddsGameOverUnderXml where
-  xpickle = pickle_over_under
 
 
 pickle_game :: PU OddsGameXml
@@ -492,9 +477,6 @@ pickle_game =
                                 xml_game_home_team,
                                 xml_game_over_under)
 
-instance XmlPickler OddsGameXml where
-  xpickle = pickle_game
-
 
 pickle_message :: PU Message
 pickle_message =
@@ -520,11 +502,6 @@ pickle_message =
                   xml_time_stamp m)
 
 
-instance XmlPickler Message where
-  xpickle = pickle_message
-
-
-
 
 -- * Tasty Tests
 odds_tests :: TestTree
@@ -541,7 +518,7 @@ test_pickle_of_unpickle_is_identity :: TestTree
 test_pickle_of_unpickle_is_identity =
   testCase "pickle composed with unpickle is the identity" $ do
     let path = "test/xml/Odds_XML.xml"
-    (expected :: [Message], actual) <- pickle_unpickle "message" path
+    (expected, actual) <- pickle_unpickle pickle_message path
     actual @?= expected