[project @ 2003-09-23 15:10:23 by simonpj]

[ghc-hetmet.git] / ghc / compiler / parser / Ctype.lhs

diff --git a/ghc/compiler/parser/Ctype.lhs b/ghc/compiler/parser/Ctype.lhs
index adcaec2..414aa4f 100644 (file)
--- a/ghc/compiler/parser/Ctype.lhs
+++ b/ghc/compiler/parser/Ctype.lhs
@@ -10,12 +10,11 @@ module Ctype
        , is_upper      -- Char# -> Bool
        , is_digit      -- Char# -> Bool
        ) where
-\end{code}
 
-\begin{code}
-import Bits    ( Bits((.&.)) )
-import Int     ( Int32 )
-import PrelBase ( Char#, Char(..) )
+#include "HsVersions.h"
+
+import DATA_INT                ( Int32 )
+import DATA_BITS       ( Bits((.&.)) )
 \end{code}
 
 Bit masks
@@ -35,10 +34,11 @@ The predicates below look costly, but aren't, GHC+GCC do a great job
 at the big case below.
 
 \begin{code}
-is_ctype :: Int -> Char# -> Bool
-is_ctype mask c = (fromIntegral (charType (C# c)) .&. fromIntegral mask) /= (0::Int32)
+{-# INLINE is_ctype #-}
+is_ctype :: Int -> Char -> Bool
+is_ctype mask c = (fromIntegral (charType c) .&. fromIntegral mask) /= (0::Int32)
 
-is_ident, is_symbol, is_any, is_space, is_lower, is_upper, is_digit :: Char# -> Bool
+is_ident, is_symbol, is_any, is_space, is_lower, is_upper, is_digit :: Char -> Bool
 is_ident  = is_ctype cIdent
 is_symbol = is_ctype cSymbol
 is_any    = is_ctype cAny
@@ -64,7 +64,7 @@ charType c = case c of
    '\7'   -> 0                         -- \007
    '\8'   -> 0                         -- \010
    '\9'   -> cAny + cSpace             -- \t
-   '\10'  -> cAny + cSpace             -- \n
+   '\10'  -> cSpace                   -- \n (not allowed in strings, so !cAny)
    '\11'  -> cAny + cSpace             -- \v
    '\12'  -> cAny + cSpace             -- \f
    '\13'  -> cAny + cSpace             -- ^M