- should work now with alex 3 and ghc 7.2

[packages/BNFC.git] / BNFC-alex3.patch

diff -ur BNFC-2.4.2.0/formats/haskell2/CFtoAlex2.hs BNFC-2.4.2.0-alex3/formats/haskell2/CFtoAlex2.hs
--- BNFC-2.4.2.0/formats/haskell2/CFtoAlex2.hs	2011-10-28 20:28:01.560188285 +0200
+++ BNFC-2.4.2.0-alex3/formats/haskell2/CFtoAlex2.hs	2011-10-28 20:49:10.615238951 +0200
@@ -59,6 +59,7 @@
   -- "import " ++ errMod,
   if shareStrings then "import " ++ shareMod else "",
   if byteStrings  then "import qualified Data.ByteString.Char8 as BS" else "",
+  "import Data.Word (Word8)",
   "}",
   ""
   ]
@@ -200,13 +201,13 @@
   "                AlexSkip  inp' len     -> go inp'",
   "                AlexToken inp' len act -> act pos ("++stringTake++" len str) : (go inp')",
   "",
-  "alexGetChar :: AlexInput -> Maybe (Char,AlexInput)",
-  "alexGetChar (p, _, s) =",
+  "alexGetByte :: AlexInput -> Maybe (Word8,AlexInput)",
+  "alexGetByte (p, _, s) =",
   "  case "++stringUncons++" s of",
   "    "++stringNilP++"  -> Nothing",
   "    "++stringConsP++" ->",
   "             let p' = alexMove p c",
-  "              in p' `seq` Just (c, (p', c, s))",
+  "              in p' `seq` Just ((fromIntegral $ ord c), (p', c, s))",
   "",
   "alexInputPrevChar :: AlexInput -> Char",
   "alexInputPrevChar (p, c, s) = c",