Refactor, try to limit dependencies

src/Dodge/Data/Terminal.hs

@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
 
@@ -7,40 +6,25 @@ module Dodge.Data.Terminal where
 import Color
 import Control.Lens
 import Data.Aeson
+import Data.Aeson.TH
 import qualified Data.Map.Strict as M
 import qualified Data.Text as T
 import Dodge.Data.WorldEffect
-import GHC.Generics
 
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TerminalStatus where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalStatus
+    deriving (Eq, Ord, Show, Read)
 
 data TerminalInput = TerminalInput
     { _tiText :: T.Text
     , _tiFocus :: Bool
     , _tiSel :: (Int, Int)
     }
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TerminalInput where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalInput
+    deriving (Eq, Ord, Show, Read)
 
 data TerminalBootProgram
     = TerminalBootMempty
     | TerminalBootLines [TerminalLine]
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON TerminalBootProgram where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalBootProgram
+    deriving (Eq, Show, Read)
 
 data Terminal = Terminal
     { _tmID :: Int
@@ -60,31 +44,16 @@ data Terminal = Terminal
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON Terminal where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON Terminal
+    deriving (Eq, Show, Read)
 
 data TerminalLineString = TerminalLineConst String Color
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TerminalLineString where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalLineString
+    deriving (Eq, Ord, Show, Read)
 
 data TmTm
     = TmId
     | TmTmClearDisplayedLines
     | TmTmSetStatus TerminalStatus
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TmTm where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TmTm
+    deriving (Eq, Ord, Show, Read)
 
 data TerminalLine
     = TerminalLineDisplay
@@ -99,34 +68,19 @@ data TerminalLine
         { _tlPause :: Int
         , _tlEffect :: TmWdWd --Terminal -> World -> World
         }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON TerminalLine where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalLine
+    deriving (Eq, Show, Read)
 
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON TerminalToggle where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalToggle
+    deriving (Eq, Ord, Show, Read)
 
 data BlBl
     = BlNegate
     | BlConst Bool
     | BlId
-    deriving (Eq, Ord, Show, Read, Generic)
-
-instance ToJSON BlBl where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON BlBl
+    deriving (Eq, Ord, Show, Read)
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -134,12 +88,7 @@ data EffectArguments
         { _argType :: String
         , _argList :: M.Map String [TerminalLine]
         }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON EffectArguments where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON EffectArguments
+    deriving (Eq, Show, Read)
 
 data TerminalCommandEffect
     = TerminalCommandArguments EffectArguments
@@ -151,12 +100,7 @@ data TerminalCommandEffect
     | TerminalCommandEffectCommands
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON TerminalCommandEffect where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalCommandEffect
+    deriving (Eq, Show, Read)
 
 data TerminalCommand = TerminalCommand
     { _tcString :: String
@@ -164,12 +108,7 @@ data TerminalCommand = TerminalCommand
     , _tcHelp :: String
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
-    deriving (Eq, Show, Read, Generic)
-
-instance ToJSON TerminalCommand where
-    toEncoding = genericToEncoding defaultOptions
-
-instance FromJSON TerminalCommand
+    deriving (Eq, Show, Read)
 
 makeLenses ''TerminalInput
 makeLenses ''Terminal
@@ -177,3 +116,15 @@ makeLenses ''TerminalLine
 makeLenses ''TerminalToggle
 makeLenses ''EffectArguments
 makeLenses ''TerminalCommand
+deriveJSON defaultOptions ''TerminalStatus
+deriveJSON defaultOptions ''TerminalInput
+deriveJSON defaultOptions ''TerminalBootProgram
+deriveJSON defaultOptions ''Terminal
+deriveJSON defaultOptions ''TerminalLineString
+deriveJSON defaultOptions ''TmTm
+deriveJSON defaultOptions ''TerminalLine
+deriveJSON defaultOptions ''TerminalToggle
+deriveJSON defaultOptions ''BlBl
+deriveJSON defaultOptions ''EffectArguments
+deriveJSON defaultOptions ''TerminalCommandEffect
+deriveJSON defaultOptions ''TerminalCommand