[Pkg-haskell-commits] darcs: frown: Desurgar n+k patterns, not supported by ghc any more (Closes: #628317)

[Joachim Breitner]

Thu Jun  2 18:33:55 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Desurgar n+k patterns, not supported by ghc any more (Closes: #628317)
  Ignore-this: 56891d0337f48d1abe97a3ed20e2aa09

    M ./changelog +4
    A ./patches/07_no-n-plus-k-pattern
    M ./patches/series +1

Thu Jun  2 18:33:55 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Desurgar n+k patterns, not supported by ghc any more (Closes: #628317)
  Ignore-this: 56891d0337f48d1abe97a3ed20e2aa09
diff -rN -u old-frown//changelog new-frown//changelog
--- old-frown//changelog	2011-06-02 18:35:31.467780637 +0000
+++ new-frown//changelog	2011-06-02 18:35:31.485277183 +0000
@@ -1,7 +1,11 @@
 frown (0.6.1-11) UNRELEASED; urgency=low
 
+  [ Marco Silva ]
   * Use ghc instead of ghc6
 
+  [ Joachim Breitner ]
+  * Desurgar n+k patterns, not supported by ghc any more (Closes: #628317)
+
  -- Marco Silva <marcot at debian.org>  Sat, 15 Jan 2011 12:40:46 -0200
 
 frown (0.6.1-10) unstable; urgency=low
diff -rN -u old-frown//patches/07_no-n-plus-k-pattern new-frown//patches/07_no-n-plus-k-pattern
--- old-frown//patches/07_no-n-plus-k-pattern	1970-01-01 00:00:00.000000000 +0000
+++ new-frown//patches/07_no-n-plus-k-pattern	2011-06-02 18:35:31.481275029 +0000
@@ -0,0 +1,80 @@
+Index: frown-0.6.1/SearchTree.lhs
+===================================================================
+--- frown-0.6.1.orig/SearchTree.lhs	2011-06-02 20:28:02.000000000 +0200
++++ frown-0.6.1/SearchTree.lhs	2011-06-02 20:28:43.000000000 +0200
+@@ -60,10 +60,10 @@
+ > fromOrdList avs               =  fst (build (Prelude.length avs) avs)
+ >   where
+ >   build 0 x                   =  (Leaf, x)
+->   build (n + 1) x             =  (Node l a v r, z)
+->     where m                   =  n `div` 2
++>   build n x                   =  (Node l a v r, z)
++>     where m                   =  n-1 `div` 2
+ >           (l, (a, v) : y)     =  build m       x
+->           (r, z)              =  build (n - m) y
++>           (r, z)              =  build (n - 1 - m) y
+ 
+ > fromList_C                    :: (Ord a) => (v -> v -> v) -> [(a, v)] -> FM a v
+ > fromList_C combine            =  fromOrdList . group . mergeSortBy (\ (a1, _) (a2, _) -> a1 <= a2)
+@@ -99,4 +99,4 @@
+ 
+ 
+ > unsafeLookup                  :: (Ord a, Show a) => FM a v -> a -> v
+-> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
+\ No newline at end of file
++> unsafeLookup fm a             =  fromMaybe (error ("unsafeLookup: key not found: " ++ show a)) (lookup fm a)
+Index: frown-0.6.1/Base.lhs
+===================================================================
+--- frown-0.6.1.orig/Base.lhs	2011-06-02 20:29:02.000000000 +0200
++++ frown-0.6.1/Base.lhs	2011-06-02 20:30:17.000000000 +0200
+@@ -166,13 +166,13 @@
+ 
+ > revTake                       :: Int -> RevList a -> RevList a
+ > revTake 0 _                   =  Nil
+-> revTake (_n + 1) Nil          =  Nil
+-> revTake (n + 1) (as :> a)     =  revTake n as :> a
++> revTake _n Nil                =  Nil
++> revTake n (as :> a)           =  revTake (n-1) as :> a
+ 
+ > revDrop                       :: Int -> RevList a -> RevList a
+ > revDrop 0 as                  =  as
+-> revDrop (_n + 1) Nil          =  Nil
+-> revDrop (n + 1) (as :> _a)    =  revDrop n as
++> revDrop _n Nil                =  Nil
++> revDrop n (as :> _a)          =  revDrop (n-1) as
+ 
+ %-------------------------------------------------------------------------------
+ \subsection{Formatting text}
+Index: frown-0.6.1/Lexer2.lhs
+===================================================================
+--- frown-0.6.1.orig/Lexer2.lhs	2011-06-02 20:30:37.000000000 +0200
++++ frown-0.6.1/Lexer2.lhs	2011-06-02 20:30:59.000000000 +0200
+@@ -139,7 +139,7 @@
+ > nested			:: Int -> String -> (String, String)
+ > nested _     []		=  ([], [])
+ > nested 0     ('-' : '}' : s)	=  ([], '-':'}':s)
+-> nested (n+1) ('-' : '}' : s)	=  '-' <| '}' <| nested n s
++> nested n     ('-' : '}' : s)	=  '-' <| '}' <| nested (n - 1) s
+ > nested n     ('{' : '-' : s)	=  '{' <| '-' <| nested (n + 1) s
+ > nested n     (c : s)		=  c <| nested n s
+ 
+@@ -156,4 +156,4 @@
+ 
+ > isSymbol, isIdChar	        :: Char -> Bool
+ > isSymbol c			=  c `elem` "!@#$%&*+./<=>?\\^|:-~"
+-> isIdChar c			=  isAlphaNum c || c `elem` "_'"
+\ No newline at end of file
++> isIdChar c			=  isAlphaNum c || c `elem` "_'"
+Index: frown-0.6.1/Future.lhs
+===================================================================
+--- frown-0.6.1.orig/Future.lhs	2011-06-02 20:31:44.000000000 +0200
++++ frown-0.6.1/Future.lhs	2011-06-02 20:32:01.000000000 +0200
+@@ -60,7 +60,7 @@
+ 
+ > prune                         :: Int -> Future -> Future
+ > prune 0 (Future _ts)          =  fromList []
+-> prune (n + 1) (Future ts)     =  fromList [ (a, prune n us) | (a, us) <- FM.toList ts ]
++> prune n (Future ts)           =  fromList [ (a, prune (n-1) us) | (a, us) <- FM.toList ts ]
+ 
+ > domain                        :: Future -> Set Symbol
+ > domain (Future f)             =  Set.fromList (map fst (FM.toList f))
diff -rN -u old-frown//patches/series new-frown//patches/series
--- old-frown//patches/series	2011-06-02 18:35:31.463788761 +0000
+++ new-frown//patches/series	2011-06-02 18:35:31.485277183 +0000
@@ -4,3 +4,4 @@
 04_manual-typos
 05_only-build-pdf
 06_utf8
+07_no-n-plus-k-pattern