[Pkg-haskell-commits] darcs: alex: Fix for bug #623067.

[Erik de Castro Lopo]

Sun Apr 17 06:22:01 UTC 2011  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Fix for bug #623067.
  Ignore-this: aa2af532f97dfaf3d4eeacf4806b6e67

    M ./changelog -1 +9
    A ./patches/
    A ./patches/fix-bang-pattern.diff
    A ./patches/series

Sun Apr 17 06:22:01 UTC 2011  Erik de Castro Lopo <erikd at mega-nerd.com>
  * Fix for bug #623067.
  Ignore-this: aa2af532f97dfaf3d4eeacf4806b6e67
diff -rN -u old-alex/changelog new-alex/changelog
--- old-alex/changelog	2011-04-17 06:22:37.395063481 +0000
+++ new-alex/changelog	2011-04-17 06:22:37.403063902 +0000
@@ -1,3 +1,11 @@
+alex (2.3.5-2) unstable; urgency=low
+
+  [ Erik de Castro Lopo ]
+  * Fix generated haskell code so it doesn't fail with -Werror
+    (Closes: #623067).
+
+ -- Erik de Castro Lopo <erikd at mega-nerd.com>  Sun, 17 Apr 2011 15:52:17 +1000
+
 alex (2.3.5-1) unstable; urgency=low
 
   [ Erik de Castro Lopo ]
@@ -8,7 +16,7 @@
   * Use ghc instead of ghc6
 
   [ Joachim Breitner ]
-  * New upstream release 
+  * New upstream release
 
  -- Joachim Breitner <nomeata at debian.org>  Tue, 29 Mar 2011 13:43:36 +0530
 
diff -rN -u old-alex/patches/fix-bang-pattern.diff new-alex/patches/fix-bang-pattern.diff
--- old-alex/patches/fix-bang-pattern.diff	1970-01-01 00:00:00.000000000 +0000
+++ new-alex/patches/fix-bang-pattern.diff	2011-04-17 06:22:37.399063691 +0000
@@ -0,0 +1,67 @@
+# Author : Erik de Castro Lopo <erikd at mega-nerd.com>
+# Description : Fix generated haskell code so it doesn't fail with -Werror.
+# Debian Version : 2.3.5
+# Date : Sun, 17 Apr 2011 15:45:41 +1000
+
+Index: alex-2.3.5/templates/GenericTemplate.hs
+===================================================================
+--- alex-2.3.5.orig/templates/GenericTemplate.hs
++++ alex-2.3.5/templates/GenericTemplate.hs
+@@ -9,7 +9,7 @@
+ 
+ #ifdef ALEX_GHC
+ #define ILIT(n) n#
+-#define FAST_INT_BINDING(n) (n)
++#define FAST_INT_BINDING(n) (!(n))
+ #define IBOX(n) (I# (n))
+ #define FAST_INT Int#
+ #define LT(n,m) (n <# m)
+@@ -57,10 +57,10 @@
+ ALEX_IF_BIGENDIAN
+   narrow16Int# i
+   where
+-        i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
+-        high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
+-        low  = int2Word# (ord# (indexCharOffAddr# arr off'))
+-        off' = off *# 2#
++        !i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)
++        !high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
++        !low  = int2Word# (ord# (indexCharOffAddr# arr off'))
++        !off' = off *# 2#
+ ALEX_ELSE
+   indexInt16OffAddr# arr off
+ ALEX_ENDIF
+@@ -74,14 +74,14 @@
+ ALEX_IF_BIGENDIAN
+   narrow32Int# i
+   where
+-   i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`
++   !i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`
+ 		     (b2 `uncheckedShiftL#` 16#) `or#`
+ 		     (b1 `uncheckedShiftL#` 8#) `or#` b0)
+-   b3   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 3#)))
+-   b2   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 2#)))
+-   b1   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
+-   b0   = int2Word# (ord# (indexCharOffAddr# arr off'))
+-   off' = off *# 4#
++   !b3   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 3#)))
++   !b2   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 2#)))
++   !b1   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))
++   !b0   = int2Word# (ord# (indexCharOffAddr# arr off'))
++   !off' = off *# 4#
+ ALEX_ELSE
+   indexInt32OffAddr# arr off
+ ALEX_ENDIF
+Index: alex-2.3.5/src/Scan.x
+===================================================================
+--- alex-2.3.5.orig/src/Scan.x
++++ alex-2.3.5/src/Scan.x
+@@ -11,7 +11,7 @@
+ -------------------------------------------------------------------------------
+ 
+ {
+-{-# OPTIONS_GHC -w #-}
++{-# OPTIONS_GHC -w -XBangPatterns #-}
+ 
+ module Scan(lexer, AlexPosn(..), Token(..), Tkn(..), tokPosn) where
+ 
diff -rN -u old-alex/patches/series new-alex/patches/series
--- old-alex/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ new-alex/patches/series	2011-04-17 06:22:37.399063691 +0000
@@ -0,0 +1 @@
+fix-bang-pattern.diff