[Pkg-haskell-commits] darcs: haskell-haddock: patches/alex3-hack.patch: Dropped, included by upstream

[Joachim Breitner]

Tue Mar 13 12:58:07 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * patches/alex3-hack.patch: Dropped, included by upstream
  Ignore-this: 21aedcc5579f9223a209ae2813b43fc

    M ./changelog +1
    R ./patches/
    R ./patches/alex3-hack.patch
    R ./patches/series

Tue Mar 13 12:58:07 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * patches/alex3-hack.patch: Dropped, included by upstream
  Ignore-this: 21aedcc5579f9223a209ae2813b43fc
diff -rN -u old-haskell-haddock//changelog new-haskell-haddock//changelog
--- old-haskell-haddock//changelog	2012-03-13 13:15:17.323248337 +0000
+++ new-haskell-haddock//changelog	2012-03-13 13:15:17.355249432 +0000
@@ -3,6 +3,7 @@
   * New upstream release
   * patch/build_without_ghci.patch: Dropped, fixed upstream in
     http://hackage.haskell.org/trac/ghc/ticket/3558
+  * patches/alex3-hack.patch: Dropped, included by upstream
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 13 Mar 2012 13:51:51 +0100
 
diff -rN -u old-haskell-haddock//patches/alex3-hack.patch new-haskell-haddock//patches/alex3-hack.patch
--- old-haskell-haddock//patches/alex3-hack.patch	2012-03-13 13:15:17.323248337 +0000
+++ new-haskell-haddock//patches/alex3-hack.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-src/Haddock/Lex.x | 34 ++++++++++++++++++++++++++++++++--
-1 files changed, 32 insertions(+), 2 deletions(-)
-
---- a/src/Haddock/Lex.x
-+++ b/src/Haddock/Lex.x
-@@ -30,12 +30,11 @@
- import DynFlags
- 
- import Data.Char
-+import Data.Word (Word8)
- import Numeric
- import System.IO.Unsafe
- }
- 
--%wrapper "posn"
--
- $ws    = $white # \n
- $digit = [0-9]
- $hexdigit = [0-9a-fA-F]
-@@ -139,6 +138,37 @@
- -- -----------------------------------------------------------------------------
- -- Alex support stuff
- 
-+-- XXX: copied the posn wrapper code from Alex to make this lexer work
-+-- with both Alex 2.x and Alex 3.x. However, we are not using the
-+-- Unicode/UTF-8 support in Alex 3.x, and Unicode documentation will
-+-- probably get mangled.
-+
-+type AlexInput = (AlexPosn, -- current position,
-+ Char, -- previous char
-+ String) -- current input string
-+
-+alexInputPrevChar :: AlexInput -> Char
-+alexInputPrevChar (p,c,s) = c
-+
-+alexGetByte :: AlexInput -> Maybe (Word8,AlexInput)
-+alexGetByte (p,c,[]) = Nothing
-+alexGetByte (p,_,(c:s)) = let p' = alexMove p c
-+ in p' `seq` Just (fromIntegral (ord c), (p', c, s))
-+
-+-- for compat with Alex 2.x:
-+alexGetChar :: AlexInput -> Maybe (Char,AlexInput)
-+alexGetChar i = case alexGetByte i of
-+ Nothing -> Nothing
-+ Just (b,i') -> Just (chr (fromIntegral b), i')
-+
-+alexMove :: AlexPosn -> Char -> AlexPosn
-+alexMove (AlexPn a l c) '\t' = AlexPn (a+1) l (((c+7) `div` 8)*8+1)
-+alexMove (AlexPn a l c) '\n' = AlexPn (a+1) (l+1) 1
-+alexMove (AlexPn a l c) _ = AlexPn (a+1) l (c+1)
-+
-+data AlexPosn = AlexPn !Int !Int !Int
-+ deriving (Eq,Show)
-+
- type StartCode = Int
- type Action = AlexPosn -> String -> StartCode -> (StartCode -> [LToken]) -> DynFlags -> [LToken]
- 
diff -rN -u old-haskell-haddock//patches/series new-haskell-haddock//patches/series
--- old-haskell-haddock//patches/series	2012-03-13 13:15:17.323248337 +0000
+++ new-haskell-haddock//patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-alex3-hack.patch