From bedc74462b382cae1e5db2c9b87270dc8f149dc3 Mon Sep 17 00:00:00 2001
From: Lennart Spitzner <hexagoxel@hexagoxel.de>
Date: Tue, 9 Jan 2018 16:30:37 +0100
Subject: [PATCH] Fix addHelpCommand to not expect a local CommandDesc

---
 src/UI/Butcher/Monadic/BuiltinCommands.hs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/UI/Butcher/Monadic/BuiltinCommands.hs b/src/UI/Butcher/Monadic/BuiltinCommands.hs
index 50bd682..295e429 100644
--- a/src/UI/Butcher/Monadic/BuiltinCommands.hs
+++ b/src/UI/Butcher/Monadic/BuiltinCommands.hs
@@ -29,19 +29,21 @@ import           System.IO
 -- | Adds a proper full help command. To obtain the 'CommandDesc' value, see
 -- 'UI.Butcher.Monadic.cmdRunParserWithHelpDesc' or
 -- 'UI.Butcher.Monadic.IO.mainFromCmdParserWithHelpDesc'.
-addHelpCommand :: Applicative f => CommandDesc () -> CmdParser f (IO ()) ()
+addHelpCommand :: Applicative f => CommandDesc a -> CmdParser f (IO ()) ()
 addHelpCommand desc = addCmd "help" $ do
   rest <- addParamRestOfInput "SUBCOMMAND(s)" mempty
   addCmdImpl $ do
-    let parentDesc = maybe undefined snd (_cmd_mParent desc)
-    let restWords  = List.words rest
-    let descent :: [String] -> CommandDesc a -> CommandDesc a
-        descent [] curDesc = curDesc
-        descent (w:wr) curDesc =
-          case List.lookup (Just w) $ Data.Foldable.toList $ _cmd_children curDesc of
+    let restWords = List.words rest
+    let
+      descent :: [String] -> CommandDesc a -> CommandDesc a
+      descent [] curDesc = curDesc
+      descent (w:wr) curDesc =
+        case
+            List.lookup (Just w) $ Data.Foldable.toList $ _cmd_children curDesc
+          of
             Nothing    -> curDesc
             Just child -> descent wr child
-    print $ ppHelpShallow $ descent restWords parentDesc
+    print $ ppHelpShallow $ descent restWords desc
 
 -- | Adds a help command that prints help for the command currently in context.
 --