summaryrefslogtreecommitdiff
path: root/compiler/iface
diff options
context:
space:
mode:
authorIan Lynagh <ian@well-typed.com>2012-11-23 18:46:04 +0000
committerIan Lynagh <ian@well-typed.com>2012-11-23 18:46:04 +0000
commit6eb0341c83975b6d9112d55b0f6a39460c8ffdf9 (patch)
tree9c13746aa033729ae71dbd017469b616191027a5 /compiler/iface
parent464646dcfacead2dc9569cba524bf2a6af4c3388 (diff)
downloadhaskell-6eb0341c83975b6d9112d55b0f6a39460c8ffdf9.tar.gz
Revert "Move seq's fixity declaration info primops.txt.pp"
This reverts commit eb5196c48480c7dbec25aa175e43b9c20277f29c. For some reason it didn't work, and I don't have time to look into it right now.
Diffstat (limited to 'compiler/iface')
-rw-r--r--compiler/iface/LoadIface.lhs4
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index f77cb1e3b4..6dfac27d5d 100644
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -39,6 +39,7 @@ import Constants
import PrelNames
import PrelInfo
import PrimOp ( allThePrimOps, primOpFixity, primOpOcc )
+import MkId ( seqId )
import Rules
import Annotations
import InstEnv
@@ -604,7 +605,8 @@ ghcPrimIface
mi_fix_fn = mkIfaceFixCache fixities
}
where
- fixities = mapMaybe mkFixity allThePrimOps
+ fixities = (getOccName seqId, Fixity 0 InfixR) -- seq is infixr 0
+ : mapMaybe mkFixity allThePrimOps
mkFixity op = (,) (primOpOcc op) <$> primOpFixity op
\end{code}