summaryrefslogtreecommitdiff
path: root/ghc/compiler/reader
diff options
context:
space:
mode:
authorpartain <unknown>1996-06-30 16:01:37 +0000
committerpartain <unknown>1996-06-30 16:01:37 +0000
commit9d4c03805bafb6b1e1d47306b6a6c591c998e517 (patch)
tree781030b58620aecb411941ead3a3a6ca15f3e6d6 /ghc/compiler/reader
parentda3d89487174e161a42a64ff815640798b5f30e3 (diff)
downloadhaskell-9d4c03805bafb6b1e1d47306b6a6c591c998e517.tar.gz
[project @ 1996-06-30 15:56:44 by partain]
partain 1.3 changes through 960629
Diffstat (limited to 'ghc/compiler/reader')
-rw-r--r--ghc/compiler/reader/ReadPrefix.lhs8
1 files changed, 7 insertions, 1 deletions
diff --git a/ghc/compiler/reader/ReadPrefix.lhs b/ghc/compiler/reader/ReadPrefix.lhs
index 17f2a49895..3e3fb44415 100644
--- a/ghc/compiler/reader/ReadPrefix.lhs
+++ b/ghc/compiler/reader/ReadPrefix.lhs
@@ -10,6 +10,7 @@ module ReadPrefix ( rdModule ) where
IMP_Ubiq()
IMPORT_1_3(IO(hPutStr, stderr))
+IMPORT_1_3(GHCio(stThen))
import UgenAll -- all Yacc parser gumpff...
import PrefixSyn -- and various syntaxen.
@@ -80,7 +81,7 @@ cvFlag 1 = True
\begin{code}
#if __GLASGOW_HASKELL__ >= 200
# define PACK_STR packCString
-# define CCALL_THEN `GHCbase.ccallThen`
+# define CCALL_THEN `stThen`
#else
# define PACK_STR _packCString
# define CCALL_THEN `thenPrimIO`
@@ -410,8 +411,13 @@ wlkPat pat
(\sty -> ppInterleave ppSP (map (ppr sty) (lpat:lpats)))
msg = ppShow 100 (err PprForUser)
in
+#if __GLASGOW_HASKELL__ >= 200
+ ioToUgnM (GHCbase.ioToPrimIO (hPutStr stderr msg)) `thenUgn` \ _ ->
+ ioToUgnM (GHCbase.ioToPrimIO (ghcExit 1)) `thenUgn` \ _ ->
+#else
ioToUgnM (hPutStr stderr msg) `thenUgn` \ _ ->
ioToUgnM (ghcExit 1) `thenUgn` \ _ ->
+#endif
returnUgn (error "ReadPrefix")
) `thenUgn` \ (n, arg_pats) ->