shuffle 0.1.3.2 → 0.1.3.3
raw patch · 4 files changed
+11/−7 lines, 4 filesdep ~shuffledep ~uhc-util
Dependency ranges changed: shuffle, uhc-util
Files
- changelog.md +4/−0
- shuffle.cabal +3/−3
- src/UHC/Shuffle/Common.hs +3/−3
- src/UHC/Shuffle/Version.hs +1/−1
changelog.md view
@@ -1,5 +1,9 @@ # Changelog +## 0.1.3.3 - 20150430++- [compatibility] GHC 7.10 compatibility, indirectly via pkg uhc-util w.r.t. more strict behaviour of sortOn+ ## 0.1.3.2 - 20150427 - [build] GHC 7.10 compatibility
shuffle.cabal view
@@ -1,5 +1,5 @@ Name: shuffle-Version: 0.1.3.2+Version: 0.1.3.3 Copyright: Utrecht University, Department of Information and Computing Sciences, Software Technology group Description: Shuffle tool used by UHC (Utrecht Haskell Compiler) Synopsis: Shuffle tool for UHC@@ -50,7 +50,7 @@ uulib >= 0.9, uuagc >= 0.9.40.3, uuagc-cabal >= 1.0.3.0,- uhc-util >= 0.1.0.2,+ uhc-util >= 0.1.5.5, Cabal >= 1.14, filepath >= 1.2 if flag(network-uri)@@ -63,4 +63,4 @@ Hs-Source-Dirs: src-main Main-Is: Main.hs Build-Depends: base >= 4 && < 5,- shuffle >= 0.1.3.2+ shuffle >= 0.1.3.3
src/UHC/Shuffle/Common.hs view
@@ -363,7 +363,7 @@ sortOnVariantRefOrderMp' :: VariantRefOrderMp -> [(VariantOffer,x)] -> [((VariantOffer,Bool),x)] sortOnVariantRefOrderMp' m l = map snd- $ sortOn fst+ $ sortOnLazy fst $ [ ( VariantOfferForCompare (maybe 0 id o) (variantOfferAsp v) , ((v,isJust o || v == VOfferAll),x) )@@ -371,10 +371,10 @@ ] sortOnVariantRefOrderMp :: VariantRefOrderMp -> [(VariantOffer,x)] -> [x]--- sortOnVariantRefOrderMp m = map snd . sortOn fst . map (\(v,x) -> (Map.findWithDefault 0 (variantOfferRef v) m,x))+-- sortOnVariantRefOrderMp m = map snd . sortOnLazy fst . map (\(v,x) -> (Map.findWithDefault 0 (variantOfferRef v) m,x)) sortOnVariantRefOrderMp m vo = map snd- $ sortOn fst+ $ sortOnLazy fst $ [ ( VariantOfferForCompare o (variantOfferAsp v) , x )
src/UHC/Shuffle/Version.hs view
@@ -1,2 +1,2 @@ module UHC.Shuffle.Version where-version = "0.1.3.2"+version = "0.1.3.3"