[commit: ghc] master: Move seq's fixity declaration info primops.txt.pp (eb5196c)

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/eb5196c48480c7dbec25aa175e43b9c20277f29c

>---------------------------------------------------------------

commit eb5196c48480c7dbec25aa175e43b9c20277f29c
Author: Ian Lynagh <[email protected]>
Date:   Fri Nov 23 16:26:23 2012 +0000

    Move seq's fixity declaration info primops.txt.pp

>---------------------------------------------------------------

 compiler/iface/LoadIface.lhs    |    4 +---
 compiler/prelude/primops.txt.pp |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs
index 6dfac27..f77cb1e 100644
--- a/compiler/iface/LoadIface.lhs
+++ b/compiler/iface/LoadIface.lhs
@@ -39,7 +39,6 @@ import Constants
 import PrelNames
 import PrelInfo
 import PrimOp   ( allThePrimOps, primOpFixity, primOpOcc )
-import MkId     ( seqId )
 import Rules
 import Annotations
 import InstEnv
@@ -605,8 +604,7 @@ ghcPrimIface
         mi_fix_fn  = mkIfaceFixCache fixities
     }           
   where
-    fixities = (getOccName seqId, Fixity 0 InfixR)  -- seq is infixr 0
-             : mapMaybe mkFixity allThePrimOps
+    fixities = mapMaybe mkFixity allThePrimOps
     mkFixity op = (,) (primOpOcc op) <$> primOpFixity op
 \end{code}
 
diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index c6e1b47..282165f 100644
--- a/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
@@ -2091,6 +2091,7 @@ pseudoop   "seq"
    a -> b -> b
    { Evaluates its first argument to head normal form, and then returns its second
 	argument as the result. }
+   with fixity = infixr 0
 
 primtype Any k
 	{ The type constructor {\tt Any} is type to which you can unsafely coerce any