X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fparser%2FUgenUtil.lhs;h=860c33be3da648e2ee911625eee0a15d8b00576c;hb=a77abe6a30ea2763cfa1c0ca83cdce9b7200ced2;hp=70185118b39bd07f80ebd4938de770e026fbcc8b;hpb=f9120c200bcf613b58d742802172fb4c08171f0d;p=ghc-hetmet.git diff --git a/ghc/compiler/parser/UgenUtil.lhs b/ghc/compiler/parser/UgenUtil.lhs index 7018511..860c33b 100644 --- a/ghc/compiler/parser/UgenUtil.lhs +++ b/ghc/compiler/parser/UgenUtil.lhs @@ -16,7 +16,6 @@ import PreludeGlaST import Ubiq -import MainMonad ( MainIO(..) ) import Name ( RdrName(..) ) import SrcLoc ( mkSrcLoc2, mkUnknownSrcLoc ) \end{code} @@ -35,7 +34,7 @@ thenUgn x y 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 @@ -58,9 +57,7 @@ rdU_long x = returnUgn x 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