From 41da5cc505fb90352da84bcb7a84a6c353708815 Mon Sep 17 00:00:00 2001
From: Kazu Yamamoto <kazu@iij.ad.jp>
Date: Tue, 19 Nov 2013 12:54:08 +0900
Subject: [PATCH] defining deSugar.

---
 Language/Haskell/GhcMod/Gap.hs  | 23 +++++++++++++++++++++++
 Language/Haskell/GhcMod/Info.hs | 23 +----------------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/Language/Haskell/GhcMod/Gap.hs b/Language/Haskell/GhcMod/Gap.hs
index f0fe97a..c0cd85b 100644
--- a/Language/Haskell/GhcMod/Gap.hs
+++ b/Language/Haskell/GhcMod/Gap.hs
@@ -21,6 +21,7 @@ module Language.Haskell.GhcMod.Gap (
   , HasType(..)
   , errorMsgSpan
   , typeForUser
+  , deSugar
 #if __GLASGOW_HASKELL__ >= 702
 #else
   , module Pretty
@@ -32,6 +33,7 @@ import Control.Monad
 import Data.List
 import Data.Maybe
 import Data.Time.Clock
+import Desugar (deSugarExpr)
 import DynFlags
 import ErrUtils
 import FastString
@@ -43,6 +45,8 @@ import Outputable
 import PprTyThing
 import StringBuffer
 import TcType
+import TcRnTypes
+import CoreSyn
 
 import qualified InstEnv
 import qualified Pretty
@@ -298,3 +302,22 @@ typeForUser = pprTypeForUser
 #else
 typeForUser = pprTypeForUser False
 #endif
+
+deSugar :: TypecheckedModule -> LHsExpr Id -> HscEnv
+         -> IO (Maybe CoreSyn.CoreExpr)
+#if __GLASGOW_HASKELL__ >= 707
+deSugar tcm e hs_env = snd <$> deSugarExpr hs_env modu rn_env ty_env fi_env e
+  where
+    modu = ms_mod $ pm_mod_summary $ tm_parsed_module tcm
+    tcgEnv = fst $ tm_internals_ tcm
+    rn_env = tcg_rdr_env tcgEnv
+    ty_env = tcg_type_env tcgEnv
+    fi_env = tcg_fam_inst_env tcgEnv
+#else
+deSugar tcm e hs_env = snd <$> deSugarExpr hs_env modu rn_env ty_env e
+  where
+    modu = ms_mod $ pm_mod_summary $ tm_parsed_module tcm
+    tcgEnv = fst $ tm_internals_ tcm
+    rn_env = tcg_rdr_env tcgEnv
+    ty_env = tcg_type_env tcgEnv
+#endif
diff --git a/Language/Haskell/GhcMod/Info.hs b/Language/Haskell/GhcMod/Info.hs
index 590c476..2536690 100644
--- a/Language/Haskell/GhcMod/Info.hs
+++ b/Language/Haskell/GhcMod/Info.hs
@@ -18,7 +18,6 @@ import Data.List
 import Data.Maybe
 import Data.Ord as O
 import Data.Time.Clock
-import Desugar
 import GHC
 import GHC.SYB.Utils
 import HscTypes
@@ -30,7 +29,6 @@ import Language.Haskell.GhcMod.Gap (HasType(..))
 import Language.Haskell.GhcMod.Types
 import Outputable
 import TcHsSyn (hsPatType)
-import TcRnTypes
 
 ----------------------------------------------------------------
 
@@ -64,30 +62,11 @@ info opt cradle file modstr expr =
 
 ----------------------------------------------------------------
 
-#if __GLASGOW_HASKELL__ >= 707
 instance HasType (LHsExpr Id) where
     getType tcm e = do
         hs_env <- getSession
-        (_, mbe) <- Gap.liftIO $ deSugarExpr hs_env modu rn_env ty_env fi_env e
+        mbe <- Gap.liftIO $ Gap.deSugar tcm e hs_env
         return $ (getLoc e, ) <$> CoreUtils.exprType <$> mbe
-      where
-        modu = ms_mod $ pm_mod_summary $ tm_parsed_module tcm
-        tcgEnv = fst $ tm_internals_ tcm
-        rn_env = tcg_rdr_env tcgEnv
-        ty_env = tcg_type_env tcgEnv
-        fi_env = tcg_fam_inst_env tcgEnv
-#else
-instance HasType (LHsExpr Id) where
-    getType tcm e = do
-        hs_env <- getSession
-        (_, mbe) <- Gap.liftIO $ deSugarExpr hs_env modu rn_env ty_env e
-        return $ (getLoc e, ) <$> CoreUtils.exprType <$> mbe
-      where
-        modu = ms_mod $ pm_mod_summary $ tm_parsed_module tcm
-        tcgEnv = fst $ tm_internals_ tcm
-        rn_env = tcg_rdr_env tcgEnv
-        ty_env = tcg_type_env tcgEnv
-#endif
 
 instance HasType (LPat Id) where
     getType _ (L spn pat) = return $ Just (spn, hsPatType pat)