Remove some flat instances in an effort to allow compilation
This commit is contained in:
@@ -44,7 +44,8 @@ data ButtonEvent
|
||||
, _boffEff :: WdWd
|
||||
}
|
||||
| ButtonAccessTerminal
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
data Button = Button
|
||||
{ _btPict :: ButtonDraw --Button -> SPic
|
||||
@@ -58,7 +59,8 @@ data Button = Button
|
||||
, _btName :: String
|
||||
, _btColor :: Color
|
||||
}
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
data ButtonState = BtOn | BtOff | BtNoLabel
|
||||
deriving (Eq, Ord, Show, Read, Generic, Flat)
|
||||
|
||||
@@ -187,7 +187,8 @@ data CWorld = CWorld
|
||||
, _cwTime :: CWTime
|
||||
, _cwGen :: CWGen
|
||||
}
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
data CWTime = CWTime
|
||||
{ _maybeWorld :: Maybe' CWorld
|
||||
@@ -195,7 +196,8 @@ data CWTime = CWTime
|
||||
, _worldClock :: Int
|
||||
, _deathDelay :: Maybe Int
|
||||
}
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
|
||||
data CWGen = CWGen
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -32,7 +32,8 @@ data WdWd
|
||||
| WdWdNegateTrig Int
|
||||
| WdWdFromItixCrixWdWd Int Int ItCrWdWd
|
||||
| WdWdFromItCrixWdWd Item Int ItCrWdWd
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
data WdP2
|
||||
= WdP2Const Point2
|
||||
@@ -74,7 +75,8 @@ data TmWdWd
|
||||
| TmWdWdfromWdWd WdWd
|
||||
| TmWdWdTermSound SoundID
|
||||
| TmWdWdDoDeathTriggers
|
||||
deriving (Eq, Show, Read, Generic, Flat)
|
||||
deriving (Eq, Show, Read, Generic)
|
||||
--hderiving (Eq, Show, Read, Generic, Flat)
|
||||
|
||||
deriveJSON defaultOptions ''ItCrWdWd
|
||||
deriveJSON defaultOptions ''WdWd
|
||||
|
||||
Reference in New Issue
Block a user