refactoring.
This commit is contained in:
parent
dd8f9a5fcb
commit
862e8c397c
@ -90,32 +90,26 @@ typeOf opt cradle file lineNo colNo =
|
|||||||
modGraph <- G.getModuleGraph
|
modGraph <- G.getModuleGraph
|
||||||
let ms = filter (\m -> G.ml_hs_file (G.ms_location m) == Just file) modGraph
|
let ms = filter (\m -> G.ml_hs_file (G.ms_location m) == Just file) modGraph
|
||||||
modSum = head ms
|
modSum = head ms
|
||||||
p <- G.parseModule modSum
|
srcSpanTypes <- getSrcSpanType modSum lineNo colNo
|
||||||
tcm@TypecheckedModule{tm_typechecked_source = tcs} <- G.typecheckModule p
|
|
||||||
let bs = listifySpans tcs (lineNo, colNo) :: [LHsBind Id]
|
|
||||||
es = listifySpans tcs (lineNo, colNo) :: [LHsExpr Id]
|
|
||||||
ps = listifySpans tcs (lineNo, colNo) :: [LPat Id]
|
|
||||||
bts <- mapM (getType tcm) bs
|
|
||||||
ets <- mapM (getType tcm) es
|
|
||||||
pts <- mapM (getType tcm) ps
|
|
||||||
dflag <- G.getSessionDynFlags
|
dflag <- G.getSessionDynFlags
|
||||||
style <- getStyle
|
style <- getStyle
|
||||||
let sss = map (toTup dflag style) $ sortBy (cmp `on` fst) $ catMaybes $ concat [ets, bts, pts]
|
let tups = map (toTup dflag style) $ sortBy (cmp `on` fst) srcSpanTypes
|
||||||
return $ convert opt sss
|
return $ convert opt tups
|
||||||
|
|
||||||
toTup :: DynFlags -> PprStyle -> (SrcSpan, Type) -> ((Int,Int,Int,Int),String)
|
|
||||||
toTup dflag style (spn, typ) = (fourInts spn, pretty dflag style typ)
|
|
||||||
|
|
||||||
fourInts :: SrcSpan -> (Int,Int,Int,Int)
|
|
||||||
fourInts = fromMaybe (0,0,0,0) . Gap.getSrcSpan
|
|
||||||
|
|
||||||
cmp a b
|
|
||||||
| a `G.isSubspanOf` b = O.LT
|
|
||||||
| b `G.isSubspanOf` a = O.GT
|
|
||||||
| otherwise = O.EQ
|
|
||||||
|
|
||||||
errmsg = convert opt ([] :: [((Int,Int,Int,Int),String)])
|
errmsg = convert opt ([] :: [((Int,Int,Int,Int),String)])
|
||||||
|
|
||||||
|
getSrcSpanType :: G.ModSummary -> Int -> Int -> Ghc [(SrcSpan, Type)]
|
||||||
|
getSrcSpanType modSum lineNo colNo = do
|
||||||
|
p <- G.parseModule modSum
|
||||||
|
tcm@TypecheckedModule{tm_typechecked_source = tcs} <- G.typecheckModule p
|
||||||
|
let bs = listifySpans tcs (lineNo, colNo) :: [LHsBind Id]
|
||||||
|
es = listifySpans tcs (lineNo, colNo) :: [LHsExpr Id]
|
||||||
|
ps = listifySpans tcs (lineNo, colNo) :: [LPat Id]
|
||||||
|
bts <- mapM (getType tcm) bs
|
||||||
|
ets <- mapM (getType tcm) es
|
||||||
|
pts <- mapM (getType tcm) ps
|
||||||
|
return $ catMaybes $ concat [ets, bts, pts]
|
||||||
|
|
||||||
listifySpans :: Typeable a => TypecheckedSource -> (Int, Int) -> [Located a]
|
listifySpans :: Typeable a => TypecheckedSource -> (Int, Int) -> [Located a]
|
||||||
listifySpans tcs lc = listifyStaged TypeChecker p tcs
|
listifySpans tcs lc = listifyStaged TypeChecker p tcs
|
||||||
where
|
where
|
||||||
@ -124,6 +118,18 @@ listifySpans tcs lc = listifyStaged TypeChecker p tcs
|
|||||||
listifyStaged :: Typeable r => Stage -> (r -> Bool) -> GenericQ [r]
|
listifyStaged :: Typeable r => Stage -> (r -> Bool) -> GenericQ [r]
|
||||||
listifyStaged s p = everythingStaged s (++) [] ([] `mkQ` (\x -> [x | p x]))
|
listifyStaged s p = everythingStaged s (++) [] ([] `mkQ` (\x -> [x | p x]))
|
||||||
|
|
||||||
|
cmp :: SrcSpan -> SrcSpan -> Ordering
|
||||||
|
cmp a b
|
||||||
|
| a `G.isSubspanOf` b = O.LT
|
||||||
|
| b `G.isSubspanOf` a = O.GT
|
||||||
|
| otherwise = O.EQ
|
||||||
|
|
||||||
|
toTup :: DynFlags -> PprStyle -> (SrcSpan, Type) -> ((Int,Int,Int,Int),String)
|
||||||
|
toTup dflag style (spn, typ) = (fourInts spn, pretty dflag style typ)
|
||||||
|
|
||||||
|
fourInts :: SrcSpan -> (Int,Int,Int,Int)
|
||||||
|
fourInts = fromMaybe (0,0,0,0) . Gap.getSrcSpan
|
||||||
|
|
||||||
pretty :: DynFlags -> PprStyle -> Type -> String
|
pretty :: DynFlags -> PprStyle -> Type -> String
|
||||||
pretty dflag style = showOneLine dflag style . Gap.typeForUser
|
pretty dflag style = showOneLine dflag style . Gap.typeForUser
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user