Simplify terminals, move towards using tries for commands

src/Dodge/Data/Terminal.hs

@@ -18,12 +18,9 @@ import Dodge.Data.BlBl
 import Dodge.Data.Terminal.Status
 import Dodge.Data.WorldEffect
 
-data TerminalInput = TerminalInput
-    { --_tiText :: String
-      _tiSel :: (Int, Int)
-    }
-
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
+--data TerminalInput = TerminalInput
+--    { _tiSel :: (Int, Int)
+--    }
 
 data Terminal = Terminal
     { _tmID :: Int
@@ -33,52 +30,27 @@ data Terminal = Terminal
     , _tmExternalColor :: Color
     , _tmDisplayedLines :: [(String, Color)]
     , _tmFutureLines :: [TerminalLine]
-    , _tmInput :: TerminalInput
     , _tmScrollCommands :: [TerminalCommand]
-    , _tmWriteCommands :: [TerminalCommand]
-    , _tmDeathEffect :: TmWdWd -- Terminal -> World -> World
+    , _tmDeathEffect :: TmWdWd
     , _tmStatus :: TerminalStatus
     , _tmCommandHistory :: [String]
     , _tmToggles :: M.Map String TerminalToggle
     , _tmPartialCommand :: Maybe TerminalCommand
-    --    , _tmType :: TerminalType
     }
 
---deriving (Eq, Show, Read) --, Generic)
---h--deriving (Eq, Show, Read) --Generic, Flat)
-
-data TerminalType = DefaultTerminal
-
 data TerminalLineString = TerminalLineConst String Color
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data TmTm
-    = TmId
---    | TmTmSetPartialCommand (Maybe TerminalCommand)
-
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
-data TerminalLine
-    = TerminalLineDisplay
-        { _tlPause :: Int
-        , _tlString :: TerminalLineString -- World -> (String, Color)
-        }
-    | TerminalLineEffect
+data TerminalLine = TLine
         { _tlPause :: Int
+        , _tlString :: [TerminalLineString] -- World -> (String, Color)
         , _tlEffect :: TmWdWd --Terminal -> World -> World
         }
 
---deriving (Eq, Show, Read) --, Generic)
---h--deriving (Eq, Show, Read) --Generic, Flat)
-
 data TerminalToggle = TerminalToggle
     { _ttTriggerID :: Int
     , _ttDeathEffect :: BlBl
     }
 
---deriving (Eq, Ord, Show, Read) --Generic, Flat)
-
 data EffectArguments
     = NoArguments {_cmdEffect :: [TerminalLine]}
     | OneArgument
@@ -86,9 +58,6 @@ data EffectArguments
         , _argList :: M.Map String [TerminalLine]
         }
 
---deriving (Eq, Show, Read) --, Generic)
---h--deriving (Eq, Show, Read) --Generic, Flat)
-
 data TerminalCommandEffect
     = TerminalCommandArguments EffectArguments
     | TerminalCommandEffectDamageCoding
@@ -100,9 +69,6 @@ data TerminalCommandEffect
     | TerminalCommandEffectSingleCommand WdWd [String]
     | TerminalCommandEffectNone
 
---deriving (Eq, Show, Read) --, Generic)
---h--deriving (Eq, Show, Read) --Generic, Flat)
-
 data TerminalCommand = TerminalCommand
     { _tcString :: String
     , _tcAlias :: [String]
@@ -110,8 +76,11 @@ data TerminalCommand = TerminalCommand
     , _tcEffect :: TerminalCommandEffect -- Terminal -> World -> EffectArguments
     }
 
---deriving (Eq, Show, Read) --, Generic)
---h--deriving (Eq, Show, Read) --Generic, Flat)
+--data TCom = TCom
+--    { _tcomHelp :: String
+--    , _tcomArgs :: Trie Char [TerminalLine]
+--    }
+
 data TmWdWd
     = TmWdId
     | TmWdWdDisconnectTerminal
@@ -122,7 +91,6 @@ data TmWdWd
     | TmTmSetStatus TerminalStatus
     | TmTmSetPartialCommand (Maybe TerminalCommand)
 
-makeLenses ''TerminalInput
 makeLenses ''Terminal
 makeLenses ''TerminalLine
 makeLenses ''TerminalToggle
@@ -131,9 +99,7 @@ makeLenses ''TerminalCommand
 concat
     <$> mapM
         (deriveJSON defaultOptions)
-        [ ''TerminalInput
-        , ''TerminalLineString
-        , ''TmTm
+        [ ''TerminalLineString
         , ''TerminalLine
         , ''TerminalToggle
         , ''EffectArguments
@@ -141,5 +107,4 @@ concat
         , ''TerminalCommand
         , ''TmWdWd
         , ''Terminal
-        , ''TerminalType
         ]

src/Dodge/Data/Terminal/Status.hs

@@ -1,15 +1,19 @@
 {-# LANGUAGE StrictData #-}
 {-# LANGUAGE TemplateHaskell #-}
-module Dodge.Data.Terminal.Status
-    where
+
+module Dodge.Data.Terminal.Status where
+
 import Control.Lens
 import Data.Aeson
 import Data.Aeson.TH
 
-data TerminalStatus = TerminalOff | TerminalBusy | TerminalTextInput {_tiText :: String}
+data TerminalStatus
+    = TerminalOff
+    | TerminalBusy
+    | TerminalTextInput {_tiText :: String, _tiSel :: Int}
     | TerminalPressTo {_tptString :: String}
---    | TerminalArgumentInput TerminalCommand
-    deriving Eq
+    --    | TerminalArgumentInput TerminalCommand
+    deriving (Eq)
 
 makeLenses ''TerminalStatus
 deriveJSON defaultOptions ''TerminalStatus