[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [patch520] get rid of some impredicative uses of flip
From:       Ganesh Sittampalam <bugs () darcs ! net>
Date:       2010-12-29 23:44:53
Message-ID: E1PY5XU-0002Kw-4f () nevis
[Download RAW message or body]

New submission from Ganesh Sittampalam <ganesh@earth.li>:

1 patch for repository http://darcs.net/releases/branch-2.5:

Tue Nov  2 18:02:17 GMT 2010  Ganesh Sittampalam <ganesh@earth.li>
  * get rid of some impredicative uses of flip
  These aren't supported by GHC 7.0

----------
files: get-rid-of-some-impredicative-uses-of-flip.dpatch, unnamed
messages: 13430
nosy: ganesh
status: needs-review
title: get rid of some impredicative uses of flip

__________________________________
Darcs bug tracker <bugs@darcs.net>
<http://bugs.darcs.net/patch520>
__________________________________
["get-rid-of-some-impredicative-uses-of-flip.dpatch" (text/x-darcs-patch)]


New patches:

[get rid of some impredicative uses of flip
Ganesh Sittampalam <ganesh@earth.li>**20101102180217
 Ignore-this: 1016f9b0cb5bf77dc806993406a111ee
 These aren't supported by GHC 7.0
] hunk ./src/Darcs/SelectChanges.hs 316
       o <- asks opts
       if not $ isInteractive o
        then return $ promote autoChoices
-       else flip refineChoices autoChoices $ textSelect whch
+       else refineChoices (textSelect whch) autoChoices
     where forward = not $ backward whch
           promote = if forward
                     then makeEverythingSooner
hunk ./src/Darcs/Test/Patch/QuickCheck.hs 2
 {-# OPTIONS_GHC -fno-warn-deprecations -fno-warn-orphans -fglasgow-exts #-}
-{-# LANGUAGE CPP, UndecidableInstances, ScopedTypeVariables #-}
+{-# LANGUAGE CPP, UndecidableInstances, ScopedTypeVariables, ViewPatterns #-}
 
 #include "gadts.h"
 module Darcs.Test.Patch.QuickCheck ( WithStartState, RepoModel, Tree,
hunk ./src/Darcs/Test/Patch/QuickCheck.hs 311
 propFail n xs = sizeTree xs < n
 
 instance ArbitraryState s p => ArbitraryState s (WithState s p) where
-  arbitraryState rm = do xandrm' <- arbitraryState rm
-                         flip unseal xandrm' $ \(WithEndState x rm') ->
-                           return $ seal $ WithEndState (WithState rm x rm') rm'
+  arbitraryState rm = do Sealed (WithEndState x rm') <- arbitraryState rm
+                         return $ seal $ WithEndState (WithState rm x rm') rm'
 
 instance ArbitraryState s p => ArbitraryState s (FL p) where
   arbitraryState rm1 = sized $ \n -> do k <- choose (0, n)
hunk ./src/Darcs/Test/Patch/QuickCheck.hs 357
 flattenTree :: (Commute p) => Tree p C(z) -> Sealed (G2 [] (FL p) C(z))
 flattenTree NilTree = seal $ G2 $ return NilFL
 flattenTree (SeqTree p t) = mapSeal (G2 . map (p :>:) . unG2) $ flattenTree t
-flattenTree (ParTree t1 t2) = flip unseal (flattenTree t1) $ \gpss1 ->
-                              flip unseal (flattenTree t2) $ \gpss2 ->
-                              seal $ G2 $
+flattenTree (ParTree (flattenTree -> Sealed gpss1) (flattenTree -> Sealed gpss2))
+                            = seal $ G2 $
                               do ps1 <- unG2 gpss1
                                  ps2 <- unG2 gpss2
                                  ps2' :/\: ps1' <- return $ merge (ps1 :\/: ps2)
hunk ./src/Darcs/Test/Patch/QuickCheck.hs 509
 
 flattenOne :: (FromPrim p, Commute p) => Tree Prim C(x) -> Sealed (FL p C(x))
 flattenOne NilTree = seal NilFL
-flattenOne (SeqTree p t) = flip unseal (flattenOne t) $ \ps -> seal (fromPrim p :>: ps)
-flattenOne (ParTree t1 t2) =
-    flip unseal (flattenOne t1) $ \ps1 ->
-    flip unseal (flattenOne t2) $ \ps2 ->
+flattenOne (SeqTree p (flattenOne -> Sealed ps)) = seal (fromPrim p :>: ps)
+flattenOne (ParTree (flattenOne -> Sealed ps1) (flattenOne -> Sealed ps2)) =
     --traceDoc (greenText "flattening two parallel series: ps1" $$ showPatch ps1 $$
     --          greenText "ps2" $$ showPatch ps2) $
     case merge (ps1 :\/: ps2) of

Context:

[Fix linking with libdarcs under Windows
Alexey Levan <exlevan@gmail.com>**20101211225308
 Ignore-this: 4cabe87f77b5cd12fd317894cc332b63
] 
[TAG 2.5
Reinier Lamers <tux_rocker@reinier.de>**20101024151805
 Ignore-this: 1561ce30bfb1950a440c03371e0e2f20
] 
[Add entry for darcs 2.5 to NEWS file
Reinier Lamers <tux_rocker@reinier.de>**20101024151759
 Ignore-this: a8e215f0dba7d78ed0733a88eba6f2ea
] 
[No longer say that building with GHC 6.8 is possible in README
Reinier Lamers <tux_rocker@reinier.de>**20101015143439
 Ignore-this: ad9dacf3241ea1f9aa95d4ee1934c812
] 
[Bump version number to 2.5
Reinier Lamers <tux_rocker@reinier.de>**20101015142941
 Ignore-this: 4ca98852c3888fd24fcaebcb0a8b91d4
] 
[TAG 2.4.99.1
Reinier Lamers <tux_rocker@reinier.de>**20101015132045
 Ignore-this: 4293f06a5a3344bc710b65253ba0c8c1
] 
Patch bundle hash:
913300bb04eb2a08c00a8fc9b29c6c88f8a32cc6

["unnamed" (application/octet-stream)]

_______________________________________________
darcs-devel mailing list
darcs-devel@darcs.net
http://lists.osuosl.org/mailman/listinfo/darcs-devel


[prev in list] [next in list] [prev in thread] [next in thread]