ghc-core 0.4.1 → 0.4.2

raw patch · 2 files changed

+13/−6 lines, 2 filesdep ~hscolourdep ~process

Dependency ranges changed: hscolour, process

Files

• ghc-core.cabal +6/−4
• ghc-core.hs +7/−2

@@ -1,5 +1,5 @@ name:           ghc-core-version:        0.4.1+version:        0.4.2 license:        BSD3 license-file:   LICENSE author:         Don Stewart@@ -23,13 +23,15 @@ build-type:     Simple cabal-version:  >= 1.2 +-- Technically, hscolour-1.10.* will work too if we replace the+-- 'NoLit' constructor with 'False' in the call to 'hscolour'. executable ghc-core     build-depends:  base,-                    process,+                    process >=1.0.1,                     pcre-light,-                    hscolour >=1.10,+                    hscolour >=1.11,                     directory,                     filepath     main-is:        ghc-core.hs     ghc-options:    -Wall-    extensions:     PatternGuards    +    extensions:     PatternGuards

@@ -41,6 +41,8 @@  import Language.Haskell.HsColour import Language.Haskell.HsColour.Colourise+-- 'Literate' is hscolour-1.11 only. 'Bool' was used in hscolour-1.10+import Language.Haskell.HsColour.Options (Literate(..))  ------------------------------------------------------------------------ --@@ -123,10 +125,13 @@                                        then do asm <- readFile (init s)                                                return ((strs' ++ asm), Just $ takeDirectory s)                                        else return (strs', Just $ takeDirectory s)-+    +    -- If we replace the 'NoLit' constructor with 'False' (and+    -- remove the include for the Literate type), then this will+    -- work with older hscolour-1.10.* versions.     let nice = hscolour                 (optFormat opts)-                colourPrefs False True False [] strs+                colourPrefs False True NoLit [] strs      bracket         (openTempFile "/tmp" "ghc-core-XXXX.hcr")