Remove some deriving clauses

src/Dodge/Data/Button.hs

@@ -17,7 +17,7 @@ data ButtonDraw
     = DefaultDrawButton Color
     | DefaultDrawSwitch Color Color
     | DrawNoButton
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data ButtonEvent
     = ButtonDoNothing
@@ -42,8 +42,8 @@ data ButtonEvent
         , _boffEff :: WdWd
         }
     | ButtonAccessTerminal
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data Button = Button
     { _btPict :: ButtonDraw --Button -> SPic
@@ -57,11 +57,11 @@ data Button = Button
     , _btName :: String
     , _btColor :: Color
     }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data ButtonState = BtOn | BtOff | BtNoLabel
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving Eq -- (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Button
 makeLenses ''ButtonEvent

src/Dodge/Data/CWorld.hs

@@ -112,7 +112,7 @@ data CWCam = CWCam
     , _cwcBoundBox :: [Point2]
     , _cwcBoundDist :: (Float, Float, Float, Float) -- NSEW, S and W negative
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data CWorld = CWorld
     --{ _cameraCenter :: Point2
@@ -186,8 +186,8 @@ data CWorld = CWorld
     , _cwTime :: CWTime
     , _cwGen :: CWGen
     }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data CWTime = CWTime
     { _maybeWorld :: Maybe' CWorld
@@ -195,8 +195,8 @@ data CWTime = CWTime
     , _worldClock :: Int
     , _deathDelay :: Maybe Int
     }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
     
 
 data CWGen = CWGen
@@ -206,7 +206,7 @@ data CWGen = CWGen
     , _cwgRoomClipping :: [ConvexPoly]
     , _cwgSeed :: Int
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WorldBeams = WorldBeams
     { _blockingBeams :: [Beam]
@@ -214,7 +214,7 @@ data WorldBeams = WorldBeams
     , _positronBeams :: [Beam]
     , _electronBeams :: [Beam]
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''CWorld
 deriveJSON defaultOptions ''WorldBeams

src/Dodge/Data/Door.hs

@@ -20,13 +20,15 @@ import Dodge.Data.WorldEffect
 import Geometry.Data
 
 data DoorStatus = DoorOpen | DoorClosed | DoorHalfway | DoorInt Int
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving Eq
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PushSource
     = PushesItself
     | PushedBy Int
     | NotPushed
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving Eq
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data Door = Door
     { _drID :: Int
@@ -46,7 +48,7 @@ data Door = Door
     , _drObstructs :: [(Int, Int, PathEdge)]
     , _drObstacleType :: EdgeObstacle
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Door
 deriveJSON defaultOptions ''DoorStatus

src/Dodge/Data/Modification.hs

@@ -26,7 +26,7 @@ data Modification
         , _mdExternalID2 :: Int
         , _mdUpdate :: MdWdWd
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Modification
 deriveJSON defaultOptions ''Modification

src/Dodge/Data/PathGraph.hs

@@ -1,11 +1,11 @@
 --{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE DeriveAnyClass #-}
+--{-# LANGUAGE DeriveAnyClass #-}
-{-# LANGUAGE DeriveGeneric #-}
+--{-# LANGUAGE DeriveGeneric #-}
-{-# LANGUAGE ScopedTypeVariables #-}
+--{-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE StandaloneDeriving #-}
+--{-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-{-# LANGUAGE FlexibleInstances #-}
+--{-# LANGUAGE FlexibleInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 {- |
@@ -45,10 +45,10 @@ data EdgeObstacle
     | WallObstacle
     deriving (Eq, Ord, Show, Bounded, Enum, Read) --Generic, Flat)
 
-instance (ToJSON a, ToJSON b) => ToJSON (Gr a b) where
+--instance (ToJSON a, ToJSON b) => ToJSON (Gr a b) where
-    toEncoding = genericToEncoding defaultOptions
+--    toEncoding = genericToEncoding defaultOptions
-
+--
-instance (FromJSON a, FromJSON b) => FromJSON (Gr a b)
+--instance (FromJSON a, FromJSON b) => FromJSON (Gr a b)
 
 --deriving instance (Flat (Gr Point2 PathEdge))
 
@@ -57,3 +57,4 @@ makeLenses ''PathEdge
 deriveJSON defaultOptions ''PathGraph
 deriveJSON defaultOptions ''PathEdge
 deriveJSON defaultOptions ''EdgeObstacle
+deriveJSON defaultOptions ''Gr

src/Dodge/Data/Prop.hs

@@ -38,7 +38,7 @@ data Prop
         , _prRot :: Float
         , _prToggle :: Bool
         }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PropDraw
     = PropDrawSPic SPic
@@ -50,7 +50,7 @@ data PropDraw
     | PropLampCover Float
     | PropDrawToggle PropDraw
     | PropDrawGib Float
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PropUpdate
     = PropUpdateAnd PropUpdate PropUpdate
@@ -64,13 +64,13 @@ data PropUpdate
     | PropUpdatePosition WdP2f
     | PropUpdateWhen WdBl PropUpdate
     | PropUpdateIf WdBl PropUpdate PropUpdate
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data PrWdLsLs
     = PrWdLsId
     | PrWdLsSetPosition WdP2f Point3
     | PrWdLsSetColor Point3
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 makeLenses ''Prop
 deriveJSON defaultOptions ''PropDraw

src/Dodge/Data/Terminal.hs

@@ -14,20 +14,21 @@ import qualified Data.Text as T
 import Dodge.Data.WorldEffect
 
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    deriving Eq
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalInput = TerminalInput
     { _tiText :: T.Text
     , _tiFocus :: Bool
     , _tiSel :: (Int, Int)
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalBootProgram
     = TerminalBootMempty
     | TerminalBootLines [TerminalLine]
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data Terminal = Terminal
     { _tmID :: Int
@@ -47,17 +48,17 @@ data Terminal = Terminal
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalLineString = TerminalLineConst String Color
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TmTm
     = TmId
     | TmTmClearDisplayedLines
     | TmTmSetStatus TerminalStatus
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TerminalLine
     = TerminalLineDisplay
@@ -72,20 +73,20 @@ data TerminalLine
         { _tlPause :: Int
         , _tlEffect :: TmWdWd --Terminal -> World -> World
         }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data BlBl
     = BlNegate
     | BlConst Bool
     | BlId
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
@@ -93,8 +94,8 @@ data EffectArguments
         { _argType :: String
         , _argList :: M.Map String [TerminalLine]
         }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommandEffect
     = TerminalCommandArguments EffectArguments
@@ -106,8 +107,8 @@ data TerminalCommandEffect
     | TerminalCommandEffectCommands
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data TerminalCommand = TerminalCommand
     { _tcString :: String
@@ -115,8 +116,8 @@ data TerminalCommand = TerminalCommand
     , _tcHelp :: String
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 makeLenses ''TerminalInput
 makeLenses ''Terminal

src/Dodge/Data/WorldEffect.hs

@@ -16,7 +16,7 @@ import Sound.Data
 data ItCrWdWd
     = ItCrWdId
     | ItCrWdItemEffect
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdWd
     = NoWorldEffect
@@ -31,20 +31,20 @@ data WdWd
     | WdWdNegateTrig Int
     | WdWdFromItixCrixWdWd Int Int ItCrWdWd
     | WdWdFromItCrixWdWd Item Int ItCrWdWd
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 data WdP2
     = WdP2Const Point2
     | WdYouPos
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data MdWdWd
     = MdWdId
     | MdTrigIf MdWdWd MdWdWd
     | MdSetLSCol Point3
     | MdFlickerUpdate
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdBl
     = WdTrig Int
@@ -54,19 +54,19 @@ data WdBl
     | WdBlCrFilterNearPoint Float Point2 CrBl
     | WdBlBtOn Int
     | WdBlBtNotOff Int
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data WdP2f
     = WdP2f0
     | WdP2fDoorPosition Int
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data DrWdWd
     = DrWdId
     | DrWdMakeDoorDebris
     | DrWdMechanismStepwise Int [Int] [(Point2, Point2)]
     | DoorMechanism
-    deriving (Eq, Ord, Show, Read) --Generic, Flat)
+    --deriving (Eq, Ord, Show, Read) --Generic, Flat)
 
 data TmWdWd
     = TmWdId
@@ -74,8 +74,8 @@ data TmWdWd
     | TmWdWdfromWdWd WdWd
     | TmWdWdTermSound SoundID
     | TmWdWdDoDeathTriggers
-    deriving (Eq, Show, Read) --, Generic)
+    --deriving (Eq, Show, Read) --, Generic)
-    --hderiving (Eq, Show, Read) --Generic, Flat)
+    --h--deriving (Eq, Show, Read) --Generic, Flat)
 
 deriveJSON defaultOptions ''ItCrWdWd
 deriveJSON defaultOptions ''WdWd