From 7f22e74b4e21b1fd943c69214bffbd39961baa66 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Thu, 8 Jan 2015 00:54:50 -0500 Subject: [PATCH] Fix hlint suggestions. --- src/TSN/Codegen.hs | 4 ++-- src/TSN/XML/EarlyLine.hs | 6 +++--- src/TSN/XML/MLBBoxScore.hs | 23 +++++++++++++++-------- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/TSN/Codegen.hs b/src/TSN/Codegen.hs index d002823..8f9ffaf 100644 --- a/src/TSN/Codegen.hs +++ b/src/TSN/Codegen.hs @@ -85,8 +85,8 @@ tsn_expr_field_namer _ _ _ fieldname _ = -- "Db_derpSelector" -- tsn_expr_selector_namer :: String -> String -> String -> Int -> String -tsn_expr_selector_namer dn cn fn fp = - the_default dn cn (strip_leading_underscore fn) fp +tsn_expr_selector_namer dn cn fn = + the_default dn cn (strip_leading_underscore fn) where the_default = mkExprSelectorName lowercase_ns diff --git a/src/TSN/XML/EarlyLine.hs b/src/TSN/XML/EarlyLine.hs index 98c5631..5ec81a3 100644 --- a/src/TSN/XML/EarlyLine.hs +++ b/src/TSN/XML/EarlyLine.hs @@ -600,7 +600,7 @@ early_line_tests = -- test does not mean that unpickling succeeded. -- test_pickle_of_unpickle_is_identity :: TestTree -test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" $ +test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" [ check "pickle composed with unpickle is the identity" "test/xml/earlylineXML.xml", @@ -616,7 +616,7 @@ test_pickle_of_unpickle_is_identity = testGroup "pickle-unpickle tests" $ -- | Make sure we can actually unpickle these things. -- test_unpickle_succeeds :: TestTree -test_unpickle_succeeds = testGroup "unpickle tests" $ +test_unpickle_succeeds = testGroup "unpickle tests" [ check "unpickling succeeds" "test/xml/earlylineXML.xml", @@ -634,7 +634,7 @@ test_unpickle_succeeds = testGroup "unpickle tests" $ -- record. -- test_on_delete_cascade :: TestTree -test_on_delete_cascade = testGroup "cascading delete tests" $ +test_on_delete_cascade = testGroup "cascading delete tests" [ check "deleting early_lines deletes its children" "test/xml/earlylineXML.xml", diff --git a/src/TSN/XML/MLBBoxScore.hs b/src/TSN/XML/MLBBoxScore.hs index e767250..67ba236 100644 --- a/src/TSN/XML/MLBBoxScore.hs +++ b/src/TSN/XML/MLBBoxScore.hs @@ -620,6 +620,13 @@ instance DbImport Message where dbmigrate _ = run_dbmigrate $ do migrate (undefined :: MLBBoxScore) + migrate (undefined :: MLBBoxScoreMiscPitchingStatsIntentionalWalk) + migrate (undefined :: MLBBoxScoreMiscPitchingStatsHitByPitch) + migrate (undefined :: MLBBoxScoreHomerunStatsListing) + migrate (undefined :: MLBBoxScoreHomerunStatsListingPitcher) + migrate (undefined :: MLBBoxScoreTeamBreakdown) + migrate (undefined :: MLBBoxScoreRunsByInnings) + migrate (undefined :: MLBBoxScore_MLBBoxScoreTeamBreakdown) -- | We insert the message. dbimport m = do @@ -819,7 +826,7 @@ pickle_message = pickle_team_summary :: PU MLBBoxScoreTeamSummaryXml pickle_team_summary = - xpElem "Team_Summary" $ xpWrap (from_tuple, to_tuple') $ xpUnit + xpElem "Team_Summary" $ xpWrap (from_tuple, to_tuple') xpUnit where from_tuple _ = MLBBoxScoreTeamSummaryXml to_tuple' _ = () @@ -868,9 +875,9 @@ pickle_batter :: PU MLBBoxScoreHomerunStatsListingBatter pickle_batter = xpElem "HRS_Batter_ID" $ xpWrap (from_tuple, H.convert) $ - xp4Tuple (xpAttr "HRS_Batter_FirstName" $ xpText) - (xpAttr "HRS_Batter_LastName" $ xpText) - (xpAttr "RBIs" $ xpInt) + xp4Tuple (xpAttr "HRS_Batter_FirstName" xpText) + (xpAttr "HRS_Batter_LastName" xpText) + (xpAttr "RBIs" xpInt) xpInt where from_tuple = uncurryN MLBBoxScoreHomerunStatsListingBatter @@ -880,9 +887,9 @@ pickle_pitcher :: PU MLBBoxScoreHomerunStatsListingPitcherXml pickle_pitcher = xpElem "HRS_Pitcher_ID" $ xpWrap (from_tuple, H.convert) $ - xp4Tuple (xpAttr "HRS_Homeruns_Off_Pitcher" $ xpInt) - (xpAttr "HRS_Pitcher_FirstName" $ xpText) - (xpAttr "HRS_Pitcher_LastName" $ xpText) + xp4Tuple (xpAttr "HRS_Homeruns_Off_Pitcher" xpInt) + (xpAttr "HRS_Pitcher_FirstName" xpText) + (xpAttr "HRS_Pitcher_LastName" xpText) xpInt where from_tuple = uncurryN MLBBoxScoreHomerunStatsListingPitcherXml @@ -942,7 +949,7 @@ pickle_hits_by_pitch = pickle_miscellaneous_game_info :: PU MLBBoxScoreMiscellaneousGameInfoXml pickle_miscellaneous_game_info = - xpElem "Miscelaneous_Game_Info" $ xpWrap (from_tuple, to_tuple') $ xpUnit + xpElem "Miscelaneous_Game_Info" $ xpWrap (from_tuple, to_tuple') xpUnit where from_tuple _ = MLBBoxScoreMiscellaneousGameInfoXml to_tuple' _ = () -- 2.43.2