Add generic derivations and To/FromJSON instances

src/Dodge/Data/Terminal.hs

@@ -1,23 +1,35 @@
+{-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE StrictData #-}
 module Dodge.Data.Terminal
     where
+import GHC.Generics
+import Data.Aeson
 import Dodge.Data.WorldEffect
 import Color
 import Control.Lens
 import qualified Data.Text as T
 import qualified Data.Map.Strict as M
 data TerminalStatus = TerminalOff | TerminalBusy | TerminalReady
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalStatus  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalStatus 
 data TerminalInput = TerminalInput
     { _tiText   :: T.Text
     , _tiFocus  :: Bool
     , _tiSel    :: (Int,Int)
     }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalInput  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalInput 
 data TerminalBootProgram = TerminalBootMempty
     | TerminalBootLines [TerminalLine]
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalBootProgram  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalBootProgram 
 data Terminal = Terminal
     { _tmID         :: Int 
     , _tmBootProgram    :: TerminalBootProgram -- Terminal -> World -> [TerminalLine]
@@ -36,13 +48,22 @@ data Terminal = Terminal
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON Terminal  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON Terminal 
 data TerminalLineString = TerminalLineConst String Color
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalLineString  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalLineString 
 data TmTm = TmId
     | TmTmClearDisplayedLines
     | TmTmSetStatus TerminalStatus
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TmTm  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TmTm 
 data TerminalLine
     = TerminalLineDisplay
         {_tlPause :: Int
@@ -56,25 +77,35 @@ data TerminalLine
         {_tlPause :: Int
         ,_tlEffect :: TmWdWd --Terminal -> World -> World
         }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalLine where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalLine
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalToggle  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalToggle 
 data BlBl = BlNegate
     | BlConst Bool
     | BlId
-  deriving (Eq,Ord,Show,Read)
-
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON BlBl  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON BlBl 
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
     | OneArgument 
         {_argType :: String
         ,_argList :: M.Map String [TerminalLine]
         }
-  deriving (Eq,Ord,Show,Read)
-
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON EffectArguments where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON EffectArguments
 data TerminalCommandEffect = TerminalCommandArguments EffectArguments 
     | TerminalCommandEffectDamageCoding
     | TerminalCommandEffectSensorParameter
@@ -84,16 +115,23 @@ data TerminalCommandEffect = TerminalCommandArguments EffectArguments
     | TerminalCommandEffectCommands
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
-  deriving (Eq,Ord,Show,Read)
-
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalCommandEffect  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalCommandEffect 
 data TerminalCommand = TerminalCommand
     { _tcString :: String
     , _tcAlias  :: [String]
     , _tcHelp   :: String
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
-  deriving (Eq,Ord,Show,Read)
+  deriving (Eq,Ord,Show,Read,Generic)
+instance ToJSON TerminalCommand  where
+    toEncoding = genericToEncoding defaultOptions
+instance FromJSON TerminalCommand 
+makeLenses ''TerminalInput
 makeLenses ''Terminal
 makeLenses ''TerminalLine
+makeLenses ''TerminalToggle
+makeLenses ''EffectArguments
 makeLenses ''TerminalCommand
-makeLenses ''TerminalInput