projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1996-04-25 16:31:20 by partain]
[ghc-hetmet.git]
/
ghc
/
compiler
/
parser
/
UgenUtil.lhs
diff --git
a/ghc/compiler/parser/UgenUtil.lhs
b/ghc/compiler/parser/UgenUtil.lhs
index
7018511
..
860c33b
100644
(file)
--- a/
ghc/compiler/parser/UgenUtil.lhs
+++ b/
ghc/compiler/parser/UgenUtil.lhs
@@
-16,7
+16,6
@@
import PreludeGlaST
import Ubiq
import Ubiq
-import MainMonad ( MainIO(..) )
import Name ( RdrName(..) )
import SrcLoc ( mkSrcLoc2, mkUnknownSrcLoc )
\end{code}
import Name ( RdrName(..) )
import SrcLoc ( mkSrcLoc2, mkUnknownSrcLoc )
\end{code}
@@
-35,7
+34,7
@@
thenUgn x y stuff
= x stuff `thenPrimIO` \ z ->
y z stuff
= x stuff `thenPrimIO` \ z ->
y z stuff
-initUgn :: UgnM a -> MainIO a
+initUgn :: UgnM a -> IO a
initUgn action
= action (SLIT(""),SLIT(""),mkUnknownSrcLoc) `thenPrimIO` \ result ->
return result
initUgn action
= action (SLIT(""),SLIT(""),mkUnknownSrcLoc) `thenPrimIO` \ result ->
return result
@@
-58,9
+57,7
@@
rdU_long x = returnUgn x
type U_stringId = FAST_STRING
rdU_stringId :: _Addr -> UgnM U_stringId
{-# INLINE rdU_stringId #-}
type U_stringId = FAST_STRING
rdU_stringId :: _Addr -> UgnM U_stringId
{-# INLINE rdU_stringId #-}
-rdU_stringId s
- = -- ToDo (sometime): ioToUgnM (_ccall_ hash_index s) `thenUgn` \ (I# i) ->
- returnUgn (_packCString s)
+rdU_stringId s = returnUgn (_packCString s)
type U_numId = Int -- ToDo: Int
rdU_numId :: _Addr -> UgnM U_numId
type U_numId = Int -- ToDo: Int
rdU_numId :: _Addr -> UgnM U_numId