Merge pull request #26 from bgamari/master

Various cleanups
MarcWeber · Aug 25, 2016 · 8648083 · 8648083
2 parents b25a032 + 2feed77
commit 8648083
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/src/Hasktags.hs b/src/Hasktags.hs
@@ -28,7 +28,7 @@ import Data.List
 import Data.Maybe
 
 import System.IO
-import System.Directory
+import System.Directory hiding (isSymbolicLink)
 import Text.JSON.Generic
 import Control.Monad
 

diff --git a/src/Main.hs b/src/Main.hs
@@ -1,13 +1,12 @@
-{-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE CPP #-}
+
 module Main (main) where
 import Hasktags
 
 import System.Environment
 
 import Data.List
 
-import System.IO
 import System.Directory
 import System.Console.GetOpt
 import System.Exit

diff --git a/src/Tags.hs b/src/Tags.hs
@@ -16,7 +16,7 @@ import Control.Monad
 mywords :: Bool -> String -> [String]
 mywords spaced s =  case rest of
                         ')':xs -> (blanks' ++ ")") : mywords spaced xs
-			"" -> []
+                        "" -> []
                         '{':'-':xs -> (blanks' ++ "{-") : mywords spaced xs
                         '-':'}':xs -> (blanks' ++ "-}") : mywords spaced xs
                         '{':xs -> (blanks' ++ "{") : mywords spaced xs
@@ -26,22 +26,22 @@ mywords spaced s =  case rest of
                         '=':xs -> (blanks' ++ "=") : mywords spaced xs
                         ',':xs -> (blanks' ++ ",") : mywords spaced xs
                         ':':':':xs -> (blanks' ++ "::") : mywords spaced xs
-			s' -> (blanks' ++ w) : mywords spaced s''
-			      where (w, s'') = myBreak s'
-				    myBreak [] = ([],[])
-				    myBreak (':':':':xs) = ([], "::"++xs)
-				    myBreak (')':xs) = ([],')':xs)
+                        s' -> (blanks' ++ w) : mywords spaced s''
+                              where (w, s'') = myBreak s'
+                                    myBreak [] = ([],[])
+                                    myBreak (':':':':xs) = ([], "::"++xs)
+                                    myBreak (')':xs) = ([],')':xs)
                                     myBreak ('(':xs) = ([],'(':xs)
-				    myBreak ('`':xs) = ([],'`':xs)
-				    myBreak ('=':xs) = ([],'=':xs)
-				    myBreak (',':xs) = ([],',':xs)
+                                    myBreak ('`':xs) = ([],'`':xs)
+                                    myBreak ('=':xs) = ([],'=':xs)
+                                    myBreak (',':xs) = ([],',':xs)
                                     myBreak xss@(x:xs)
                                       | isSpace x
                                         = if spaced
                                           then ([], xss)
                                           else ([], dropWhile isSpace xss)
                                       | otherwise = let (a,b) = myBreak xs
-						    in  (x:a,b)
+                                                    in  (x:a,b)
                     where blanks' = if spaced then blanks else ""
                           (blanks, rest) = span {-partain:Char.-}isSpace s
 
@@ -159,4 +159,3 @@ etagsDumpThing (FoundThing _ name (Pos _filename line token fullline)) =
         ++ "\x7f"
         ++ name ++ "\x01"
         ++ show line ++ "," ++ show (line + 1) ++ "\n"
-