alex 2.3.4 → 2.3.5

raw patch · 4 files changed

+6/−13 lines, 4 files

Files

alex.cabal +1/−1
src/Main.hs +1/−8
templates/wrappers.hs +2/−2
tests/Makefile +2/−2

alex.cabal view

@@ -1,5 +1,5 @@ name: alex-version: 2.3.4+version: 2.3.5 license: BSD3 license-file: LICENSE copyright: (c) Chis Dornan, Simon Marlow

src/Main.hs view

@@ -184,14 +184,7 @@   hPutStrLn hdl code  optsToInject :: Target -> [CLIFlags] -> String-optsToInject GhcTarget _ = "{-# LANGUAGE CPP,MagicHash #-}\n" ++-                           -- disable bogus bang-pattern warnings in GHC-                           -- 6.12 - 7.0.  This only works for 7.0 because-                           -- 6.12 didn't support conditional OPTIONS pragmas.-                           -- 7.2 will stop warning about these anyway.-                           "#if __GLASGOW_HASKELL__ >= 700\n" ++-                           "{-# OPTIONS_GHC -fno-warn-lazy-unlifted-bindings #-}\n" ++-                           "#endif\n"+optsToInject GhcTarget _ = "{-# LANGUAGE CPP,MagicHash #-}\n" optsToInject _         _ = "{-# LANGUAGE CPP #-}\n"  importsToInject :: Target -> [CLIFlags] -> String

templates/wrappers.hs view

@@ -332,7 +332,7 @@   where go inp@(pos,_,str) =           case alexScan inp 0 of                 AlexEOF -> []-                AlexError _ -> error "lexical error"+                AlexError ((AlexPn _ line column),_,_) -> error $ "lexical error at " ++ (show line) ++ " line, " ++ (show column) ++ " column"                 AlexSkip  inp' len     -> go inp'                 AlexToken inp' len act -> act pos (take len str) : go inp' #endif@@ -347,7 +347,7 @@   where go inp@(pos,_,str) =           case alexScan inp 0 of                 AlexEOF -> []-                AlexError _ -> error "lexical error"+                AlexError ((AlexPn _ line column),_,_) -> error $ "lexical error at " ++ (show line) ++ " line, " ++ (show column) ++ " column"                 AlexSkip  inp' len     -> go inp'                 AlexToken inp' len act -> act pos (ByteString.take (fromIntegral len) str) : go inp' #endif

tests/Makefile view

@@ -9,7 +9,7 @@ HS_PROG_EXT = .bin endif -TESTS = simple.x tokens.x tokens_posn.x tokens_gscan.x+TESTS = simple.x tokens.x tokens_posn.x tokens_gscan.x tokens_bytestring.x  TEST_ALEX_OPTS = --template=.. @@ -28,7 +28,7 @@  ALL_TESTS = $(patsubst %.hs, %.run, $(ALL_TEST_HS)) -HC_OPTS += -package array +HC_OPTS += -package array  -package bytestring #-fglasgow-exts  %.run : %$(HS_PROG_EXT)