HTF 0.10.0.5 → 0.10.0.6

raw patch · 3 files changed

+15/−5 lines, 3 filesdep ~DiffPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Diff

API changes (from Hackage documentation)

Files

• ChangeLog +3/−0
• HTF.cabal +1/−1
• Test/Framework/Diff.hs +11/−4

@@ -1,3 +1,6 @@+* 0.10.0.6 (2012-12-06)+  - support for Diff 0.2.+ * 0.10.0.0 (2012-12-06)   - machine-readable output: the --json option provides a way for getting     machine-readable output in a simple JSON-based format

@@ -1,5 +1,5 @@ Name:             HTF-Version:          0.10.0.5+Version:          0.10.0.6 License:          LGPL License-File:     LICENSE Copyright:        (c) 2005-2012 Stefan Wehr

@@ -32,7 +32,8 @@ import Control.Exception (catch, finally, IOException) import qualified Data.List as List import Data.Char-import Data.Algorithm.Diff+import Data.Algorithm.Diff hiding (First)+import qualified Data.Algorithm.Diff as D import Test.Framework.Colors  -- for testing@@ -130,9 +131,15 @@                       string)                  "" (addPositions groups)     where-      showDiffGroup _ (F, s) = dc_fromFirstPrefix dc ++ s ++ dc_fromFirstSuffix dc-      showDiffGroup _ (S, s) = dc_fromSecondPrefix dc ++ s ++ dc_fromSecondSuffix dc-      showDiffGroup pos (B, inBoth) =+#if MIN_VERSION_Diff(0,2,0)+      showDiffGroup _ (D.First s) = dc_fromFirstPrefix dc ++ s ++ dc_fromFirstSuffix dc+      showDiffGroup _ (D.Second s) = dc_fromSecondPrefix dc ++ s ++ dc_fromSecondSuffix dc+      showDiffGroup pos (D.Both inBoth _) =+#else+      showDiffGroup _ (D.F, s) = dc_fromFirstPrefix dc ++ s ++ dc_fromFirstSuffix dc+      showDiffGroup _ (D.S, s) = dc_fromSecondPrefix dc ++ s ++ dc_fromSecondSuffix dc+      showDiffGroup pos (D.B, inBoth) =+#endif           let showStart = not $ isFirst pos               showEnd = not $ isLast pos               (contextStart, ignored, contextEnd) =