From 957c0a620059439abfbb0aafc1a5d7665cdecdda Mon Sep 17 00:00:00 2001
From: Sam Stokes <sam@35cr.sc.ss496.co.uk>
Date: Mon, 1 Jun 2009 01:44:59 +0100
Subject: [PATCH] Make arg parsing more readable

---
 main.hs | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/main.hs b/main.hs
index 0c18e61..4aa7216 100644
--- a/main.hs
+++ b/main.hs
@@ -31,18 +31,28 @@ options = [Option ['n'] ["max"] (ReqArg read "NUM") "max results (default 15)"]
 parseArgs :: [String] -> IO SearchOptions
 parseArgs argv =
   case getOpt' Permute options argv of
-    ([count], term:terms, [], []) -> return SearchOptions {
-      resultsPerPage = count,
-      searchQuery = unwords (term:terms)
-      }
-    ([], term:terms, [], []) -> return $ basicOptions $ unwords (term:terms)
-    (_, _, unrecog:unrecogs, _) -> do
-      sequence $ map unrecognised (unrecog:unrecogs)
-      err $ usageInfo usage options
-    (_, _, _, errr:errrs) -> do
-      sequence $ map putStrLn (errr:errrs)
-      err $ usageInfo usage options
-    _ -> err $ usageInfo usage options
+    ([count], term:terms, []              , []        ) ->
+      return SearchOptions {
+        resultsPerPage = count,
+        searchQuery = unwords (term:terms)
+        }
+
+    ([]     , term:terms, []              , []        ) ->
+      return $ basicOptions $ unwords (term:terms)
+
+    (_      , _         , unrecog:unrecogs, _         ) ->
+      do
+        sequence $ map unrecognised (unrecog:unrecogs)
+        errUsage
+
+    (_      , _         , _               , errr:errrs) ->
+      do
+        sequence $ map putStrLn (errr:errrs)
+        errUsage
+
+    _ -> errUsage
+  where
+    errUsage = err $ usageInfo usage options
 
 unrecognised :: String -> IO ()
 unrecognised opt = putStrLn ("Unrecognised option " ++ opt)