Remove some flat instances in an effort to allow compilation

This commit is contained in:
2022-08-21 10:10:52 +01:00
parent 6e598339f1
commit 55c3a195c9
7 changed files with 38 additions and 25 deletions
+12 -6
View File
@@ -28,7 +28,8 @@ data TerminalInput = TerminalInput
data TerminalBootProgram
= TerminalBootMempty
| TerminalBootLines [TerminalLine]
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
data Terminal = Terminal
{ _tmID :: Int
@@ -48,7 +49,8 @@ data Terminal = Terminal
, _tmCommandHistory :: [String]
, _tmToggles :: M.Map String TerminalToggle
}
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
data TerminalLineString = TerminalLineConst String Color
deriving (Eq, Ord, Show, Read, Generic, Flat)
@@ -72,7 +74,8 @@ data TerminalLine
{ _tlPause :: Int
, _tlEffect :: TmWdWd --Terminal -> World -> World
}
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
data TerminalToggle = TerminalToggle
{ _ttTriggerID :: Int
@@ -92,7 +95,8 @@ data EffectArguments
{ _argType :: String
, _argList :: M.Map String [TerminalLine]
}
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
data TerminalCommandEffect
= TerminalCommandArguments EffectArguments
@@ -104,7 +108,8 @@ data TerminalCommandEffect
| TerminalCommandEffectCommands
| TerminalCommandEffectSingleCommand WdWd [String]
| TerminalCommandEffectNone
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
data TerminalCommand = TerminalCommand
{ _tcString :: String
@@ -112,7 +117,8 @@ data TerminalCommand = TerminalCommand
, _tcHelp :: String
, _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
}
deriving (Eq, Show, Read, Generic, Flat)
deriving (Eq, Show, Read, Generic)
--hderiving (Eq, Show, Read, Generic, Flat)
makeLenses ''TerminalInput
makeLenses ''Terminal