projects
/
haskell-directory.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0a8d23b
)
Fix the type of wgencat
author
Ian Lynagh
<igloo@earth.li>
Thu, 29 Mar 2007 16:42:23 +0000
(16:42 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 29 Mar 2007 16:42:23 +0000
(16:42 +0000)
Data/Char.hs
patch
|
blob
|
history
GHC/Unicode.hs
patch
|
blob
|
history
diff --git
a/Data/Char.hs
b/Data/Char.hs
index
64f8508
..
f770999
100644
(file)
--- a/
Data/Char.hs
+++ b/
Data/Char.hs
@@
-76,7
+76,7
@@
import Prelude(Char,String)
import Char
import Ix
import NHC.FFI (CInt)
import Char
import Ix
import NHC.FFI (CInt)
-foreign import ccall unsafe "WCsubst.h u_gencat" wgencat :: CInt -> Int
+foreign import ccall unsafe "WCsubst.h u_gencat" wgencat :: CInt -> CInt
#endif
-- | Convert a single digit 'Char' to the corresponding 'Int'.
#endif
-- | Convert a single digit 'Char' to the corresponding 'Int'.
@@
-135,7
+135,7
@@
data GeneralCategory
-- | The Unicode general category of the character.
generalCategory :: Char -> GeneralCategory
#if defined(__GLASGOW_HASKELL__) || defined(__NHC__)
-- | The Unicode general category of the character.
generalCategory :: Char -> GeneralCategory
#if defined(__GLASGOW_HASKELL__) || defined(__NHC__)
-generalCategory c = toEnum (wgencat (fromIntegral (ord c)))
+generalCategory c = toEnum $ fromIntegral $ wgencat $ fromIntegral $ ord c
#endif
#ifdef __HUGS__
generalCategory c = toEnum (primUniGenCat c)
#endif
#ifdef __HUGS__
generalCategory c = toEnum (primUniGenCat c)
diff --git
a/GHC/Unicode.hs
b/GHC/Unicode.hs
index
e22fae5
..
0c0cc12
100644
(file)
--- a/
GHC/Unicode.hs
+++ b/
GHC/Unicode.hs
@@
-182,7
+182,7
@@
foreign import ccall unsafe "u_towtitle"
towtitle :: CInt -> CInt
foreign import ccall unsafe "u_gencat"
towtitle :: CInt -> CInt
foreign import ccall unsafe "u_gencat"
- wgencat :: CInt -> Int
+ wgencat :: CInt -> CInt
-- -----------------------------------------------------------------------------
-- No libunicode, so fall back to the ASCII-only implementation (never used, indeed)
-- -----------------------------------------------------------------------------
-- No libunicode, so fall back to the ASCII-only implementation (never used, indeed)