X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fprelude%2FPrelNames.lhs;h=86267fb4724bf59268d0f4079a209505fe3ec373;hb=8612b9a9f60161f65e656f65df8b679008911b3a;hp=84d09d146bd8bbcac6bc1c606304796392446d48;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git

diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs
index 84d09d1..86267fb 100644
--- a/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@ -36,11 +36,11 @@ Nota Bene: all Names defined in here should come from the base package
 
 
 \begin{code}
-{-# OPTIONS_GHC -w #-}
+{-# OPTIONS -w #-}
 -- The above warning supression flag is a temporary kludge.
 -- While working on this module you are encouraged to remove it and fix
 -- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings
+--     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
 -- for details
 
 module PrelNames (
@@ -56,8 +56,7 @@ module PrelNames (
 
 #include "HsVersions.h"
 
-import PackageConfig
-import Module	  ( Module, ModuleName, mkModule, mkModuleNameFS )
+import Module
 import OccName	  ( dataName, tcName, clsName, varName, mkOccNameFS,
 		    mkVarOccFS )
 import RdrName	  ( RdrName, nameRdrName, mkOrig, rdrNameOcc, mkUnqual )
@@ -269,6 +268,7 @@ gHC_WORD	= mkBaseModule FSLIT("GHC.Word")
 mONAD		= mkBaseModule FSLIT("Control.Monad")
 mONAD_FIX	= mkBaseModule FSLIT("Control.Monad.Fix")
 aRROW		= mkBaseModule FSLIT("Control.Arrow")
+gHC_DESUGAR     = mkBaseModule FSLIT("GHC.Desugar")
 rANDOM		= mkBaseModule FSLIT("System.Random")
 gLA_EXTS	= mkBaseModule FSLIT("GHC.Exts")
 
@@ -656,7 +656,7 @@ mfixName	   = methName mONAD_FIX FSLIT("mfix") mfixIdKey
 
 -- Arrow notation
 arrAName	   = varQual aRROW FSLIT("arr")	  arrAIdKey
-composeAName	   = varQual aRROW FSLIT(">>>")	  composeAIdKey
+composeAName	   = varQual gHC_DESUGAR FSLIT(">>>") composeAIdKey
 firstAName	   = varQual aRROW FSLIT("first") firstAIdKey
 appAName	   = varQual aRROW FSLIT("app")	  appAIdKey
 choiceAName	   = varQual aRROW FSLIT("|||")	  choiceAIdKey