in stage1, we should get isPrint and isUpper from Compat.Unicode, not…

… Data.Char
ghc · Mar 29, 2006 · 274a7b1 · 274a7b1
1 parent c117f1b
commit 274a7b1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/ghc/compiler/parser/Lexer.x b/ghc/compiler/parser/Lexer.x
@@ -44,14 +44,14 @@ import Ctype
 import Util		( maybePrefixMatch, readRational )
 
 import DATA_BITS
-import Data.Char
+import Data.Char 	( chr )
 import Ratio
 --import TRACE
 
 #if __GLASGOW_HASKELL__ >= 605
-import Data.Char 	( GeneralCategory(..), generalCategory )
+import Data.Char 	( GeneralCategory(..), generalCategory, isPrint, isUpper )
 #else
-import Compat.Unicode	( GeneralCategory(..), generalCategory )
+import Compat.Unicode	( GeneralCategory(..), generalCategory, isPrint, isUpper )
 #endif
 }
 

diff --git a/ghc/lib/compat/Compat/Unicode.hs b/ghc/lib/compat/Compat/Unicode.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS -cpp #-}
 module Compat.Unicode (
-    GeneralCategory(..), generalCategory,
+    GeneralCategory(..), generalCategory, isPrint, isUpper
   ) where
 
 #if __GLASGOW_HASKELL__ > 604
@@ -54,4 +54,13 @@ generalCategory c = toEnum (wgencat (fromIntegral (ord c)))
 
 foreign import ccall unsafe "u_gencat"
   wgencat :: CInt -> Int
+
+isPrint c = iswprint (fromIntegral (ord c)) /= 0
+isUpper c = iswupper (fromIntegral (ord c)) /= 0
+
+foreign import ccall unsafe "u_iswprint"
+  iswprint :: CInt -> CInt
+
+foreign import ccall unsafe "u_iswupper"
+  iswupper :: CInt -> CInt
 #endif