[commit: ghc] wip/ttg5-data-2017-11-15: Fix boostrapping with GHC 8.0.2 (cb3e388)
git at git.haskell.org
git at git.haskell.org
Fri Nov 17 11:45:35 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/ttg5-data-2017-11-15
Link : http://ghc.haskell.org/trac/ghc/changeset/cb3e388da223dc1879c97d8eea51de872135260c/ghc
>---------------------------------------------------------------
commit cb3e388da223dc1879c97d8eea51de872135260c
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date: Fri Nov 17 13:44:59 2017 +0200
Fix boostrapping with GHC 8.0.2
>---------------------------------------------------------------
cb3e388da223dc1879c97d8eea51de872135260c
compiler/hsSyn/HsInstances.hs | 4 +---
compiler/hsSyn/HsInstances.hs-boot | 4 +---
compiler/hsSyn/HsInstances2.hs | 29 ++++++++---------------------
compiler/hsSyn/HsInstances2.hs-boot | 11 ++++-------
4 files changed, 14 insertions(+), 34 deletions(-)
diff --git a/compiler/hsSyn/HsInstances.hs b/compiler/hsSyn/HsInstances.hs
index 169199e..7e69f74 100644
--- a/compiler/hsSyn/HsInstances.hs
+++ b/compiler/hsSyn/HsInstances.hs
@@ -55,9 +55,7 @@ deriving instance (DataIdLR p p) => Data (HsDerivingClause p)
deriving instance (DataIdLR p p) => Data (ConDecl p)
deriving instance DataIdLR p p => Data (TyFamInstDecl p)
deriving instance DataIdLR p p => Data (DataFamInstDecl p)
-deriving instance (DataIdLR p p) => Data (FamEqn p (HsTyPats p) (HsDataDefn p))
-deriving instance (DataIdLR p p) => Data (FamEqn p (HsTyPats p) (LHsType p))
-deriving instance (DataIdLR p p) => Data (FamEqn p (LHsQTyVars p) (LHsType p))
+deriving instance (DataIdLR p p,Data pats,Data rhs) => Data (FamEqn p pats rhs)
deriving instance (DataIdLR p p) => Data (ClsInstDecl p)
deriving instance (DataIdLR p p) => Data (InstDecl p)
deriving instance (DataIdLR p p) => Data (DerivDecl p)
diff --git a/compiler/hsSyn/HsInstances.hs-boot b/compiler/hsSyn/HsInstances.hs-boot
index 3dda7e8..a942e86 100644
--- a/compiler/hsSyn/HsInstances.hs-boot
+++ b/compiler/hsSyn/HsInstances.hs-boot
@@ -9,12 +9,10 @@ import Data.Data hiding ( Fixity )
import HsExtension ( DataIdLR )
import HsBinds
import HsDecls
-import HsTypes
instance (DataIdLR p p) => Data (VectDecl p)
instance (DataIdLR pL pR) => Data (HsLocalBindsLR pL pR)
instance (DataIdLR p p) => Data (HsDecl p)
instance (DataIdLR p p) => Data (HsGroup p)
instance (DataIdLR pL pL) => Data (NHsValBindsLR pL)
-instance (DataIdLR p p) => Data (FamEqn p (HsTyPats p) (HsDataDefn p))
-instance (DataIdLR p p) => Data (FamEqn p (HsTyPats p) (LHsType p))
+instance (DataIdLR p p,Data pats,Data rhs) => Data (FamEqn p pats rhs)
diff --git a/compiler/hsSyn/HsInstances2.hs b/compiler/hsSyn/HsInstances2.hs
index 2250387..b0502c8 100644
--- a/compiler/hsSyn/HsInstances2.hs
+++ b/compiler/hsSyn/HsInstances2.hs
@@ -18,8 +18,6 @@ import Data.Data hiding ( Fixity )
import {-# SOURCE #-} HsInstances ()
import HsExtension
--- import HsBinds
-import HsDecls
import HsExpr
import HsLit
import HsTypes
@@ -79,16 +77,11 @@ deriving instance (DataIdLR p p) => Data (HsExpr p)
deriving instance (DataIdLR p p) => Data (HsTupArg p)
deriving instance (DataIdLR p p) => Data (HsCmd p)
deriving instance (DataIdLR p p) => Data (HsCmdTop p)
-deriving instance (DataIdLR p p) => Data (MatchGroup p (LHsExpr p))
-deriving instance (DataIdLR p p) => Data (MatchGroup p (LHsCmd p))
-deriving instance (DataIdLR p p) => Data (Match p (LHsExpr p))
-deriving instance (DataIdLR p p) => Data (Match p (LHsCmd p))
-deriving instance (DataIdLR p p) => Data (GRHSs p (LHsExpr p))
-deriving instance (DataIdLR p p) => Data (GRHSs p (LHsCmd p))
-deriving instance (DataIdLR p p) => Data (GRHS p (LHsExpr p))
-deriving instance (DataIdLR p p) => Data (GRHS p (LHsCmd p))
-deriving instance (DataIdLR p p) => Data (StmtLR p p (LHsExpr p))
-deriving instance (DataIdLR p p) => Data (StmtLR p p (LHsCmd p))
+deriving instance (DataIdLR p p,Data body) => Data (MatchGroup p body)
+deriving instance (DataIdLR p p,Data body) => Data (Match p body)
+deriving instance (DataIdLR p p,Data body) => Data (GRHSs p body)
+deriving instance (DataIdLR p p,Data body) => Data (GRHS p body)
+deriving instance (DataIdLR p p,Data body) => Data (StmtLR p p body)
deriving instance (DataIdLR p p) => Data (ParStmtBlock p p)
deriving instance (DataIdLR p p) => Data (ApplicativeArg p)
deriving instance (DataIdLR p p) => Data (HsSplice p)
@@ -108,13 +101,8 @@ deriving instance (DataIdLR p p) => Data (HsOverLit p)
-- Data derivations from HsTypes ---------------------------------------
deriving instance (DataIdLR p p) => Data (LHsQTyVars p)
-
-deriving instance (DataIdLR p p) => Data (HsImplicitBndrs p (LHsType p))
-deriving instance (DataIdLR p p) => Data (HsImplicitBndrs p (FamEqn p (HsTyPats p) (HsDataDefn p)))
-deriving instance (DataIdLR p p) => Data (HsImplicitBndrs p (FamEqn p (HsTyPats p) (LHsType p)))
-
-deriving instance (DataIdLR p p) => Data (HsWildCardBndrs p (LHsType p))
-deriving instance (DataIdLR p p) => Data (HsWildCardBndrs p (LHsSigType p))
+deriving instance (DataIdLR p p, Data thing) => Data (HsImplicitBndrs p thing)
+deriving instance (DataIdLR p p, Data thing) => Data (HsWildCardBndrs p thing)
deriving instance (DataIdLR p p) => Data (HsTyVarBndr p)
deriving instance (DataIdLR p p) => Data (HsType p)
deriving instance (DataId p) => Data (HsWildCardInfo p)
@@ -126,7 +114,6 @@ deriving instance DataId p => Data (AmbiguousFieldOcc p)
-- Data derivations from HsPat -----------------------------------------
deriving instance (DataIdLR p p) => Data (Pat p)
-deriving instance (DataIdLR p p) => Data (HsRecFields p (LPat p))
-deriving instance (DataIdLR p p) => Data (HsRecFields p (LHsExpr p))
+deriving instance (DataIdLR p p, Data body) => Data (HsRecFields p body)
-- ---------------------------------------------------------------------
diff --git a/compiler/hsSyn/HsInstances2.hs-boot b/compiler/hsSyn/HsInstances2.hs-boot
index 16ac7ee..33c7356 100644
--- a/compiler/hsSyn/HsInstances2.hs-boot
+++ b/compiler/hsSyn/HsInstances2.hs-boot
@@ -8,7 +8,6 @@ module HsInstances2 where
import Data.Data hiding ( Fixity )
import HsExtension ( DataIdLR )
-import HsDecls
import HsExpr
import HsTypes
import HsPat
@@ -17,15 +16,13 @@ instance (DataIdLR p p) => Data (HsExpr p)
instance (DataIdLR p p) => Data (HsTyVarBndr p)
instance (DataIdLR p p) => Data (HsType p)
instance (DataIdLR p p) => Data (LHsQTyVars p)
-instance (DataIdLR p p) => Data (HsImplicitBndrs p (LHsType p))
-instance (DataIdLR p p) => Data (HsImplicitBndrs p (FamEqn p (HsTyPats p) (HsDataDefn p)))
-instance (DataIdLR p p) => Data (HsImplicitBndrs p (FamEqn p (HsTyPats p) (LHsType p)))
-instance (DataIdLR p p) => Data (HsWildCardBndrs p (LHsSigType p))
+instance (DataIdLR p p, Data thing) => Data (HsImplicitBndrs p thing)
+instance (DataIdLR p p, Data thing) => Data (HsWildCardBndrs p thing)
instance (DataIdLR p p) => Data (ConDeclField p)
instance (DataIdLR p p) => Data (HsSplice p)
-instance (DataIdLR p p) => Data (MatchGroup p (LHsExpr p))
+instance (DataIdLR p p,Data body) => Data (MatchGroup p body)
instance (DataIdLR p p) => Data (Pat p)
-instance (DataIdLR p p) => Data (GRHSs p (LHsExpr p))
+instance (DataIdLR p p,Data body) => Data (GRHSs p body)
More information about the ghc-commits
mailing list