rebase to ghc main repo

diff --cc compiler/deSugar/Desugar.lhs
Simple merge

diff --cc compiler/deSugar/DsExpr.lhs
Simple merge

diff --cc compiler/main/DynFlags.hs
Simple merge

diff --cc compiler/parser/Lexer.x
Simple merge

diff --cc compiler/parser/Parser.y.pp
Simple merge

diff --cc compiler/prelude/PrelNames.lhs
index 0f027c5,f92d94e..5c2dfa0
--- 1/compiler/prelude/PrelNames.lhs
--- 2/compiler/prelude/PrelNames.lhs
+++ b/compiler/prelude/PrelNames.lhs
@@@ -247,8 -257,7 +262,8 @@@ pRELUDE            = mkBaseModule_ pRELUDE_NAM
  gHC_PRIM, gHC_TYPES, gHC_UNIT, gHC_ORDERING, gHC_GENERICS,
      gHC_MAGIC,
      gHC_CLASSES, gHC_BASE, gHC_ENUM,
-     gHC_SHOW, gHC_READ, gHC_NUM, gHC_INTEGER, gHC_INTEGER_TYPE, gHC_LIST, gHC_PARR,
+     gHC_SHOW, gHC_READ, gHC_NUM, gHC_INTEGER, gHC_INTEGER_TYPE, gHC_LIST,
 +    gHC_HETMET_CODETYPES,
      gHC_TUPLE, dATA_TUPLE, dATA_EITHER, dATA_STRING, dATA_FOLDABLE, dATA_TRAVERSABLE,
      gHC_PACK, gHC_CONC, gHC_IO, gHC_IO_Exception,
      gHC_ST, gHC_ARR, gHC_STABLE, gHC_ADDR, gHC_PTR, gHC_ERR, gHC_REAL,
@@@ -271,11 -280,9 +286,10 @@@ gHC_READ = mkBaseModule (fsLit "GHC.Rea
  gHC_NUM               = mkBaseModule (fsLit "GHC.Num")
  gHC_INTEGER   = mkIntegerModule (fsLit "GHC.Integer")
  gHC_INTEGER_TYPE= mkIntegerModule (fsLit "GHC.Integer.Type")
- gHC_LIST      = mkBaseModule (fsLit "GHC.List")
- gHC_PARR      = mkBaseModule (fsLit "GHC.PArr")
 +gHC_HETMET_CODETYPES = mkBaseModule (fsLit "GHC.HetMet.CodeTypes")
- gHC_TUPLE     = mkPrimModule (fsLit "GHC.Tuple")
- dATA_TUPLE    = mkBaseModule (fsLit "Data.Tuple")
+ gHC_LIST        = mkBaseModule (fsLit "GHC.List")
+ gHC_TUPLE       = mkPrimModule (fsLit "GHC.Tuple")
+ dATA_TUPLE      = mkBaseModule (fsLit "Data.Tuple")
  dATA_EITHER   = mkBaseModule (fsLit "Data.Either")
  dATA_STRING   = mkBaseModule (fsLit "Data.String")
  dATA_FOLDABLE = mkBaseModule (fsLit "Data.Foldable")
@@@ -746,32 -759,22 +766,32 @@@ readClassName      = clsQual gHC_READ (fs
  enumFromToPName, enumFromThenToPName, nullPName, lengthPName,
      singletonPName, replicatePName, mapPName, filterPName,
      zipPName, crossMapPName, indexPName, toPName,
-     emptyPName, appPName :: Name
- enumFromToPName          = varQual gHC_PARR (fsLit "enumFromToP") enumFromToPIdKey
- enumFromThenToPName= varQual gHC_PARR (fsLit "enumFromThenToP") enumFromThenToPIdKey
- nullPName       = varQual gHC_PARR (fsLit "nullP")             nullPIdKey
- lengthPName     = varQual gHC_PARR (fsLit "lengthP")           lengthPIdKey
- singletonPName    = varQual gHC_PARR (fsLit "singletonP")         singletonPIdKey
- replicatePName          = varQual gHC_PARR (fsLit "replicateP")        replicatePIdKey
- mapPName        = varQual gHC_PARR (fsLit "mapP")              mapPIdKey
- filterPName     = varQual gHC_PARR (fsLit "filterP")           filterPIdKey
- zipPName        = varQual gHC_PARR (fsLit "zipP")              zipPIdKey
- crossMapPName   = varQual gHC_PARR (fsLit "crossMapP")         crossMapPIdKey
- indexPName      = varQual gHC_PARR (fsLit "!:")                indexPIdKey
- toPName                 = varQual gHC_PARR (fsLit "toP")               toPIdKey
- emptyPName        = varQual gHC_PARR (fsLit "emptyP")            emptyPIdKey
- appPName          = varQual gHC_PARR (fsLit "+:+")               appPIdKey
+     emptyPName, appPName :: PackageId -> Name
+ enumFromToPName     pkg = varQual (gHC_PARR pkg) (fsLit "enumFromToP")     enumFromToPIdKey
+ enumFromThenToPName pkg = varQual (gHC_PARR pkg) (fsLit "enumFromThenToP") enumFromThenToPIdKey
+ nullPName           pkg = varQual (gHC_PARR pkg) (fsLit "nullP")           nullPIdKey
+ lengthPName         pkg = varQual (gHC_PARR pkg) (fsLit "lengthP")         lengthPIdKey
+ singletonPName      pkg = varQual (gHC_PARR pkg) (fsLit "singletonP")      singletonPIdKey
+ replicatePName      pkg = varQual (gHC_PARR pkg) (fsLit "replicateP")      replicatePIdKey
+ mapPName            pkg = varQual (gHC_PARR pkg) (fsLit "mapP")            mapPIdKey
+ filterPName         pkg = varQual (gHC_PARR pkg) (fsLit "filterP")         filterPIdKey
+ zipPName            pkg = varQual (gHC_PARR pkg) (fsLit "zipP")            zipPIdKey
+ crossMapPName       pkg = varQual (gHC_PARR pkg) (fsLit "crossMapP")       crossMapPIdKey
+ indexPName          pkg = varQual (gHC_PARR pkg) (fsLit "!:")              indexPIdKey
+ toPName             pkg = varQual (gHC_PARR pkg) (fsLit "toP")             toPIdKey
+ emptyPName          pkg = varQual (gHC_PARR pkg) (fsLit "emptyP")          emptyPIdKey
+ appPName            pkg = varQual (gHC_PARR pkg) (fsLit "+:+")             appPIdKey
  
 +-- code type things
 +hetmet_brak_name, hetmet_esc_name, hetmet_csp_name :: Name
 +hetmet_guest_integer_literal_name, hetmet_guest_string_literal_name, hetmet_guest_char_literal_name :: Name
 +hetmet_brak_name = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_brak") hetmet_brak_key
 +hetmet_esc_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_esc")  hetmet_esc_key
 +hetmet_csp_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_csp") hetmet_csp_key
 +hetmet_guest_integer_literal_name = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_guest_integer_literal") hetmet_guest_integer_literal_key
 +hetmet_guest_string_literal_name  = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_guest_string_literal")  hetmet_guest_string_literal_key
 +hetmet_guest_char_literal_name    = varQual gHC_HETMET_CODETYPES (fsLit "hetmet_guest_char_literal")    hetmet_guest_char_literal_key
 +
  -- IO things
  ioTyConName, ioDataConName, thenIOName, bindIOName, returnIOName,
      failIOName :: Name

diff --cc compiler/prelude/TysWiredIn.lhs
index aaef164,db2ea1b..29fa628
--- 1/compiler/prelude/TysWiredIn.lhs
--- 2/compiler/prelude/TysWiredIn.lhs
+++ b/compiler/prelude/TysWiredIn.lhs
@@@ -176,17 -169,13 +176,19 @@@ doubleTyConName    = mkWiredInTyConNam
  doubleDataConName  = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "D#") doubleDataConKey doubleDataCon
  
  parrTyConName, parrDataConName :: Name
- parrTyConName   = mkWiredInTyConName   BuiltInSyntax gHC_PARR (fsLit "[::]") parrTyConKey parrTyCon 
- parrDataConName   = mkWiredInDataConName UserSyntax    gHC_PARR (fsLit "PArr") parrDataConKey parrDataCon
+ parrTyConName   = mkWiredInTyConName   BuiltInSyntax 
+                     gHC_PARR' (fsLit "[::]") parrTyConKey parrTyCon 
+ parrDataConName = mkWiredInDataConName UserSyntax    
+                     gHC_PARR' (fsLit "PArr") parrDataConKey parrDataCon
  
 +hetMetCodeTypeTyConName :: Name
 +hetMetCodeTypeTyConName       = mkWiredInTyConName   BuiltInSyntax gHC_HETMET_CODETYPES (fsLit "<[]>@")      hetMetCodeTypeTyConKey   hetMetCodeTypeTyCon 
 +hetMetCodeTypeDataConName :: Name
 +hetMetCodeTypeDataConName     =
 +    mkWiredInDataConName  BuiltInSyntax gHC_HETMET_CODETYPES (fsLit "<[]>")      hetMetCodeTypeDataConKey hetMetCodeTypeDataCon
 +
  boolTyCon_RDR, false_RDR, true_RDR, intTyCon_RDR, charTyCon_RDR,
 -    intDataCon_RDR, listTyCon_RDR, consDataCon_RDR, parrTyCon_RDR:: RdrName
 +    intDataCon_RDR, listTyCon_RDR, consDataCon_RDR, parrTyCon_RDR, hetMetCodeTypeTyCon_RDR :: RdrName
  boolTyCon_RDR   = nameRdrName boolTyConName
  false_RDR     = nameRdrName falseDataConName
  true_RDR      = nameRdrName trueDataConName

diff --cc compiler/typecheck/TcExpr.lhs
Simple merge

diff --cc compiler/typecheck/TcHsSyn.lhs
Simple merge

diff --cc compiler/typecheck/TcRnMonad.lhs
Simple merge

diff --cc compiler/typecheck/TcRnTypes.lhs
Simple merge