Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : real-src-loc-span
http://hackage.haskell.org/trac/ghc/changeset/b7d09fd6da2a806155baa317c9d42d28bcc52ca6 >--------------------------------------------------------------- commit b7d09fd6da2a806155baa317c9d42d28bcc52ca6 Author: Ian Lynagh <[email protected]> Date: Wed Jun 1 18:45:24 2011 +0100 More RealSrc* >--------------------------------------------------------------- compiler/typecheck/TcSplice.lhs | 16 ++++++++++------ ghc/InteractiveUI.hs | 11 +++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/compiler/typecheck/TcSplice.lhs b/compiler/typecheck/TcSplice.lhs index 3cc2eb5..6da5741 100644 --- a/compiler/typecheck/TcSplice.lhs +++ b/compiler/typecheck/TcSplice.lhs @@ -897,12 +897,16 @@ instance TH.Quasi (IOEnv (Env TcGblEnv TcLclEnv)) where qReport False msg = addReport (text msg) empty qLocation = do { m <- getModule - ; l <- getSrcSpanM - ; return (TH.Loc { TH.loc_filename = unpackFS (srcSpanFile l) - , TH.loc_module = moduleNameString (moduleName m) - , TH.loc_package = packageIdString (modulePackageId m) - , TH.loc_start = (srcSpanStartLine l, srcSpanStartCol l) - , TH.loc_end = (srcSpanEndLine l, srcSpanEndCol l) }) } + ; l <- getSrcSpanM + ; r <- case l of + UnhelpfulSpan _ -> pprPanic "qLocation: Unhelpful location" + (ppr l) + RealSrcSpan s -> return s + ; return (TH.Loc { TH.loc_filename = unpackFS (srcSpanFile r) + , TH.loc_module = moduleNameString (moduleName m) + , TH.loc_package = packageIdString (modulePackageId m) + , TH.loc_start = (srcSpanStartLine r, srcSpanStartCol r) + , TH.loc_end = (srcSpanEndLine r, srcSpanEndCol r) }) } qReify v = reify v qClassInstances = lookupClassInstances diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs index 0f68607..4d9e8a9 100644 --- a/ghc/InteractiveUI.hs +++ b/ghc/InteractiveUI.hs @@ -12,6 +12,15 @@ module InteractiveUI ( interactiveUI, ghciWelcomeMsg ) where +interactiveUI :: a +interactiveUI = error "XXX" + +ghciWelcomeMsg :: a +ghciWelcomeMsg = error "XXX" + +-- XXX +#if 0 + #include "HsVersions.h" import qualified GhciMonad @@ -2469,3 +2478,5 @@ setBreakFlag :: Bool -> GHC.BreakArray -> Int -> IO Bool setBreakFlag toggle array index | toggle = GHC.setBreakOn array index | otherwise = GHC.setBreakOff array index +#endif + _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
