Use Data.Char.{chr,ord} qualified in generated code

Author: andreasabel

.gitignore

@@ -6,7 +6,6 @@
 *.dyn_o
 *.info
 /.ghc.environment.*
-/data/
 /dist
 /dist-newstyle
 /examples/*.alex.hs

data/AlexTemplate.hs

@@ -146,7 +146,7 @@ alex_scan_tkn user__ orig_input len input__ s last_acc =
      Nothing -> (new_acc, input__)
      Just (c, new_input) ->
 #ifdef ALEX_DEBUG
-      Debug.Trace.trace ("State: " ++ show IBOX(s) ++ ", char: " ++ show c ++ " " ++ (show . chr . fromIntegral) c) $
+      Debug.Trace.trace ("State: " ++ show IBOX(s) ++ ", char: " ++ show c ++ " " ++ (show . Data.Char.chr . fromIntegral) c) $
 #endif
       case fromIntegral c of { IBOX(ord_c) ->
         let

data/AlexWrappers.hs

@@ -17,28 +17,25 @@ import Data.Word (Word8)
 #if defined(ALEX_BASIC_BYTESTRING) || defined(ALEX_POSN_BYTESTRING) || defined(ALEX_MONAD_BYTESTRING)
 
 import Data.Int (Int64)
-import qualified Data.Char
 import qualified Data.ByteString.Lazy     as ByteString
 import qualified Data.ByteString.Internal as ByteString (w2c)
 
 #elif defined(ALEX_STRICT_BYTESTRING)
 
-import qualified Data.Char
 import qualified Data.ByteString          as ByteString
 import qualified Data.ByteString.Internal as ByteString hiding (ByteString)
 import qualified Data.ByteString.Unsafe   as ByteString
 
 #else
 
-import Data.Char (ord)
 import qualified Data.Bits
 
 -- | Encode a Haskell String to a list of Word8 values, in UTF8 format.
 utf8Encode :: Char -> [Word8]
 utf8Encode = uncurry (:) . utf8Encode'
 
 utf8Encode' :: Char -> (Word8, [Word8])
-utf8Encode' c = case go (ord c) of
+utf8Encode' c = case go (Data.Char.ord c) of
                   (x, xs) -> (fromIntegral x, map fromIntegral xs)
  where
   go oc

src/Main.hs

@@ -401,6 +401,7 @@ always_imports :: [String]
 always_imports =
   [ "#include \"ghcconfig.h\""
   , "import qualified Data.Array"
+  , "import qualified Data.Char"
   ]
 
 import_glaexts :: [String]
@@ -437,8 +438,7 @@ import_glaexts =
 
 import_debug :: [String]
 import_debug =
-  [ "import Data.Char (chr)"
-  , "import qualified Debug.Trace"
+  [ "import qualified Debug.Trace"
   ]
 
 templateDir :: IO FilePath -> [CLIFlags] -> IO FilePath