Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/6eb0341c83975b6d9112d55b0f6a39460c8ffdf9 >--------------------------------------------------------------- commit 6eb0341c83975b6d9112d55b0f6a39460c8ffdf9 Author: Ian Lynagh <i...@well-typed.com> Date: Fri Nov 23 18:46:04 2012 +0000 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. >--------------------------------------------------------------- compiler/iface/LoadIface.lhs | 4 +++- compiler/prelude/primops.txt.pp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs index f77cb1e..6dfac27 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} diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp index 282165f..c6e1b47 100644 --- a/compiler/prelude/primops.txt.pp +++ b/compiler/prelude/primops.txt.pp @@ -2091,7 +2091,6 @@ 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 _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
