Cleanup
This commit is contained in:
@@ -41,7 +41,7 @@ helpf (str:_) w = maybe (Left "") Right $ do
|
||||
return $ w & infoClearInput
|
||||
([makeTermLine ("COMMAND:" ++ _tcString command)
|
||||
,makeTermLine ("ALIASES:" ++ unwords (_tcAlias command)) ]
|
||||
++ stringToTermPara (_tcHelp command ++ " " ++ argumentHelp (_tcArgumentType command))
|
||||
++ makeTermPara (_tcHelp command ++ " " ++ argumentHelp (_tcArgumentType command))
|
||||
)
|
||||
getCommands :: World -> Maybe [TerminalCommand]
|
||||
getCommands w = do
|
||||
@@ -61,8 +61,8 @@ argumentHelp mstr = case mstr of
|
||||
Nothing -> "ANY ARGUMENTS PROVIDED TO THIS COMMAND ARE IGNORED."
|
||||
Just str -> "EXPECTS " ++ str ++ " AS ARGUMENT."
|
||||
|
||||
stringToTermPara :: String -> [TerminalLine]
|
||||
stringToTermPara = map makeTermLine . makeParagraph 60
|
||||
makeTermPara :: String -> [TerminalLine]
|
||||
makeTermPara = map makeTermLine . makeParagraph 60
|
||||
|
||||
makeColorTermLine :: Color -> String -> TerminalLine
|
||||
makeColorTermLine col str = TerminalLineDisplay 0 $ const (str,col)
|
||||
@@ -79,7 +79,7 @@ infoCommand str = TerminalCommand
|
||||
, _tcArgumentType = Nothing
|
||||
, _tcArguments = const []
|
||||
, _tcEffect = const $ \w -> Right $ w & infoClearInput
|
||||
( stringToTermPara str)
|
||||
( makeTermPara str)
|
||||
}
|
||||
|
||||
commandsCommand :: TerminalCommand
|
||||
@@ -91,7 +91,7 @@ commandsCommand = TerminalCommand
|
||||
, _tcArguments = const []
|
||||
, _tcEffect = const $ \w -> Right $ w & infoClearInput
|
||||
( makeTermLine "AVAILABLE COMMANDS:"
|
||||
: stringToTermPara (unwords (maybe [""] (map _tcString) $ getCommands w))
|
||||
: makeTermPara (unwords (maybe [""] (map _tcString) $ getCommands w))
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user