4f5db92 · elk · git.iko.soy

git.iko.soy/elk

Revert "Merge pull request #1470 from brianhempel/faster_builds"

This reverts commit 96a4695e4d311e0addd1619db63062c445a55f4b, reversing changes made to ee39e7ecdb4fcec4878c875b31bebd1550e78c8c.

commit4f5db922692099010a1cc5c987ce3cc536cf0140 authorEvan Czaplicki <evancz@users.noreply.github.com> dateWed 24 Aug 2016, 11:53 (10 years ago) parent96a4695

3 files changed+15−17

compare with master

unifiedsplit

src/Nitpick/Pattern.hs+1−1 src/Nitpick/PatternMatches.hs+11−12 src/Reporting/Error/Pattern.hs+3−4

src/Nitpick/Pattern.hs+1−1

@@ -17,7 +17,7 @@ data Pattern

1717 | Anything

1818 | Literal L.Literal

1919 | AnythingBut (Set.Set L.Literal)

20− deriving (Eq, Ord)

20+ deriving (Eq)

2121

2222

2323fromCanonicalPattern :: P.Canonical -> Pattern

src/Nitpick/PatternMatches.hs+11−12

@@ -209,25 +209,25 @@ checkExpression tagDict (A.A region expression) =

209209

210210checkPatterns :: TagDict -> Region.Region -> Error.Origin -> [Pattern.Canonical] -> Result wrn ()

211211checkPatterns tagDict region origin patterns =

212− checkPatternsHelp tagDict region origin (Set.singleton Anything) patterns

212+ checkPatternsHelp tagDict region origin [Anything] patterns

213213

214214

215215checkPatternsHelp

216216 :: TagDict

217217 -> Region.Region

218218 -> Error.Origin

219− -> Set.Set Pattern

219+ -> [Pattern]

220220 -> [Pattern.Canonical]

221221 -> Result wrn ()

222222checkPatternsHelp tagDict region origin unhandled patterns =

223− case patterns of

224− [] ->

225− if Set.size unhandled == 0 then

226− return ()

227− else

228− Result.throw region (Error.Incomplete origin unhandled)

223+ case (unhandled, patterns) of

224+ ([], []) ->

225+ return ()

226+

227+ (_:_, []) ->

228+ Result.throw region (Error.Incomplete origin unhandled)

229229

230− pattern@(A.A localRegion _) : remainingPatterns ->

230+ (_, pattern@(A.A localRegion _) : remainingPatterns) ->

231231 do newUnhandled <- filterPatterns tagDict localRegion pattern unhandled

232232 checkPatternsHelp tagDict region origin newUnhandled remainingPatterns

233233

@@ -236,8 +236,8 @@ filterPatterns

236236 :: TagDict

237237 -> Region.Region

238238 -> Pattern.Canonical

239− -> Set.Set Pattern

240− -> Result wrn (Set.Set Pattern)

239+ -> [Pattern]

240+ -> Result wrn [Pattern]

241241filterPatterns tagDict region pattern unhandled =

242242 let

243243 nitPattern =

@@ -252,7 +252,6 @@ filterPatterns tagDict region pattern unhandled =

252252 else

253253 do let complementPatterns = complement tagDict nitPattern

254254 return $

255− Set.fromList $

256255 concatMap

257256 (\p -> Maybe.mapMaybe (intersection p) complementPatterns)

258257 unhandled

src/Reporting/Error/Pattern.hs+3−4

@@ -1,7 +1,6 @@

11{-# OPTIONS_GHC -Wall #-}

22module Reporting.Error.Pattern where

4−import qualified Data.Set as Set

54import Text.PrettyPrint.ANSI.Leijen (text)

76import qualified Nitpick.Pattern as Pattern

@@ -12,7 +11,7 @@ import qualified Reporting.Report as Report

1211

1312

1413data Error

15− = Incomplete Origin (Set.Set Pattern.Pattern)

14+ = Incomplete Origin [Pattern.Pattern]

1615 | Redundant

1716

1817

@@ -58,11 +57,11 @@ toReport _localizer err =

5857 (text "Any value with this shape will be handled by a previous pattern.")

5958

6059

61−unhandledError :: Set.Set Pattern.Pattern -> String -> String

60+unhandledError :: [Pattern.Pattern] -> String -> String

6261unhandledError unhandledPatterns relevantMessage =

6362 let

6463 (visiblePatterns, rest) =

65− splitAt 4 (Set.toList unhandledPatterns)

64+ splitAt 4 unhandledPatterns

6665

6766 patternList =

6867 map (Pattern.toString False) visiblePatterns