[commit: ghc] master: Fix location of spliced-in role annotations. (b84fff3)

git at git.haskell.org git at git.haskell.org
Mon Dec 2 18:13:57 UTC 2013


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b84fff3d975e4b6b9a6b89ba43f405ed708dec12/ghc

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

commit b84fff3d975e4b6b9a6b89ba43f405ed708dec12
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon Dec 2 13:02:08 2013 -0500

    Fix location of spliced-in role annotations.


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

b84fff3d975e4b6b9a6b89ba43f405ed708dec12
 compiler/hsSyn/Convert.lhs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/hsSyn/Convert.lhs b/compiler/hsSyn/Convert.lhs
index e789d17..216ab22 100644
--- a/compiler/hsSyn/Convert.lhs
+++ b/compiler/hsSyn/Convert.lhs
@@ -271,7 +271,7 @@ cvtDec (ClosedTypeFamilyD tc tyvars mkind eqns)
 cvtDec (TH.RoleAnnotD tc roles)
   = do { tc' <- tconNameL tc
        ; let roles' = map (noLoc . cvtRole) roles
-       ; return $ noLoc $ Hs.RoleAnnotD (RoleAnnotDecl tc' roles') }
+       ; returnL $ Hs.RoleAnnotD (RoleAnnotDecl tc' roles') }
 ----------------
 cvtTySynEqn :: Located RdrName -> TySynEqn -> CvtM (LTyFamInstEqn RdrName)
 cvtTySynEqn tc (TySynEqn lhs rhs)



More information about the ghc-commits mailing list