buildwrapper 0.4.0 → 0.4.1

raw patch · 3 files changed

+8/−2 lines, 3 files

Files

• buildwrapper.cabal +1/−1
• src/Language/Haskell/BuildWrapper/GHC.hs +1/−1
• src/Language/Haskell/BuildWrapper/GHCStorage.hs +6/−0

@@ -1,5 +1,5 @@ name:           buildwrapper
-version:        0.4.0
+version:        0.4.1
 cabal-version:  >= 1.8
 build-type:     Simple
 license:        BSD3

@@ -35,7 +35,7 @@ import GHC
 import SrcLoc 
 import GHC.Paths ( libdir )
-import HscTypes ( srcErrorMessages, SourceError, liftIO)
+import HscTypes ( srcErrorMessages, SourceError)
 import Outputable
 import FastString (FastString,unpackFS,concatFS,fsLit,mkFastString)
 import Lexer

@@ -123,10 +123,16 @@         srcSpan src 
                 | isGoodSrcSpan src   = object[ "SrcSpan" .= toJSON [srcLoc $ srcSpanStart src, srcLoc $ srcSpanEnd src]] 
                 | otherwise = Null
+#if __GLASGOW_HASKELL__ < 702   
         srcLoc :: SrcLoc -> Value
         srcLoc sl 
                 | isGoodSrcLoc  sl=object ["line" .= toJSON (srcLocLine sl),"column" .= toJSON (srcLocCol sl)]
                 | otherwise = Null
+#else
+        srcLoc :: SrcLoc -> Value
+        srcLoc (RealSrcLoc sl)=object ["line" .= toJSON (srcLocLine sl),"column" .= toJSON (srcLocCol sl)]
+        srcLoc _ = Null        
+#endif
         var :: Var -> Value
         var  v     = typedVar v (varType v)
         dataCon ::  DataCon -> Value