diff --git a/Setup.hs b/Setup.hs --- a/Setup.hs +++ b/Setup.hs @@ -1,13 +1,2 @@ -#!/usr/bin/env runhaskell - import Distribution.Simple -main = do - putStrLn msg - defaultMainWithHooks simpleUserHooks - -msg = "This links to the standard c library version of regular expressions.\n\ - \The corresponding c header file is regex.h and there is a chance you\n\ - \will need to edit the end of the regex-posix.cabal file to find the\n\ - \include directory and/or library.\n\ - \Alternatively you can try and use flags to the cabal executable to\n\ - \specify the include and lib directories." +main = defaultMain diff --git a/Text/Regex/Posix.hs b/Text/Regex/Posix.hs --- a/Text/Regex/Posix.hs +++ b/Text/Regex/Posix.hs @@ -68,6 +68,6 @@ getVersion_Text_Regex_Posix :: Version getVersion_Text_Regex_Posix = - Version { versionBranch = [0,93,1] -- Keep in sync with regex-posix.cabal + Version { versionBranch = [0,93,2] -- Keep in sync with regex-posix.cabal , versionTags = ["unstable"] } diff --git a/Text/Regex/Posix/Sequence.hs b/Text/Regex/Posix/Sequence.hs --- a/Text/Regex/Posix/Sequence.hs +++ b/Text/Regex/Posix/Sequence.hs @@ -49,7 +49,6 @@ ) where import Data.Array(listArray, Array) -import Data.List(map, length,) import System.IO.Unsafe(unsafePerformIO) import Text.Regex.Base.RegexLike(RegexContext(..),RegexMaker(..),RegexLike(..),MatchOffset,MatchLength,Extract(..)) import Text.Regex.Posix.Wrap diff --git a/Text/Regex/Posix/String.hs b/Text/Regex/Posix/String.hs --- a/Text/Regex/Posix/String.hs +++ b/Text/Regex/Posix/String.hs @@ -49,7 +49,7 @@ ) where import Data.Array(listArray, Array) -import Data.List(map, length, genericDrop, genericTake) +import Data.List(genericDrop, genericTake) import Foreign.C.String(withCAString) import System.IO.Unsafe(unsafePerformIO) import Text.Regex.Base.RegexLike(RegexContext(..),RegexMaker(..),RegexLike(..),MatchOffset,MatchLength) diff --git a/Text/Regex/Posix/Wrap.hsc b/Text/Regex/Posix/Wrap.hsc --- a/Text/Regex/Posix/Wrap.hsc +++ b/Text/Regex/Posix/Wrap.hsc @@ -1,3 +1,4 @@ +{-# OPTIONS_GHC -fno-warn-unused-imports #-} ----------------------------------------------------------------------------- -- | -- Module : Text.Regex.Posix.Wrap @@ -43,6 +44,7 @@ -- ** High-level API Regex, RegOffset, + RegOffsetT, (=~), (=~~), @@ -114,10 +116,11 @@ {-# CFILES cbits/regfree.c #-} #endif -import Control.Monad(mapM,liftM) +import Control.Monad(liftM) import Data.Array(Array,listArray) import Data.Bits(Bits(..)) -import Data.Int(Int32,Int64) -- need whatever RegeOffset or #regoff_t type will be +import Data.Int(Int32,Int64) -- need whatever RegeOffset or #regoff_t type will be +import Data.Word(Word32,Word64) -- need whatever RegeOffset or #regoff_t type will be import Foreign(Ptr, FunPtr, nullPtr, mallocForeignPtrBytes, addForeignPtrFinalizer, Storable(peekByteOff), allocaArray, allocaBytes, withForeignPtr,ForeignPtr,plusPtr,peekElemOff) @@ -142,6 +145,8 @@ -- character at index offset 0. So starting at 1 and ending at 2 means -- to take only the second character. type RegOffset = Int64 +--debugging 64-bit ubuntu +type RegOffsetT = (#type regoff_t) -- | A bitmapped 'CInt' containing options for compilation of regular -- expressions. Option values (and their man 3 regcomp names) are @@ -432,7 +437,7 @@ -- Allocate a temporary buffer to hold the error message allocaArray (fromIntegral errBufSize) $ \errBuf -> do nullTest errBuf "wrapError errBuf" $ do - c_regerror errCode regex_ptr errBuf errBufSize + _ <- c_regerror errCode regex_ptr errBuf errBufSize msg <- peekCAString errBuf :: IO String return (Left (errCode, msg)) diff --git a/regex-posix.cabal b/regex-posix.cabal --- a/regex-posix.cabal +++ b/regex-posix.cabal @@ -1,6 +1,6 @@ Name: regex-posix -- Keep the Version below in sync with ./Text/Regex/Posix.hs value getVersion_Text_Regex_Posix :: Version -Version: 0.94.1 +Version: 0.94.2 Cabal-Version: >=1.2 Build-Type: Custom License: BSD3 @@ -15,19 +15,32 @@ Description: The posix regex backend for regex-base Category: Text Tested-With: GHC +Build-Type: Simple +flag newBase + description: Choose base >= 4 + default: True flag splitBase description: Choose the new smaller, split-up base package. + default: True library - if flag(splitBase) - Build-Depends: regex-base >= 0.93, base >= 3.0, array, containers, bytestring - -- Need the next symbol for using CPP to get Data.ByteString.Base|Unsafe in - -- ./Text/Regex/Posix/ByteString.hs and ./Text/Regex/Posix/ByteString/Lazy.hs - CPP-Options: "-DSPLIT_BASE=1" - Extensions: MultiParamTypeClasses, FunctionalDependencies, CPP, ForeignFunctionInterface, GeneralizedNewtypeDeriving, FlexibleContexts, TypeSynonymInstances, FlexibleInstances + if flag(newBase) + Build-Depends: regex-base >= 0.93, base >= 4 && < 5, array, containers, bytestring + -- Need the next symbol for using CPP to get Data.ByteString.Base|Unsafe in + -- ./Text/Regex/Posix/ByteString.hs and ./Text/Regex/Posix/ByteString/Lazy.hs + CPP-Options: "-DSPLIT_BASE=1" + Extensions: MultiParamTypeClasses, FunctionalDependencies, CPP, ForeignFunctionInterface, GeneralizedNewtypeDeriving, FlexibleContexts, TypeSynonymInstances, FlexibleInstances else - Build-Depends: regex-base >= 0.93, base < 3.0 - Extensions: MultiParamTypeClasses, FunctionalDependencies, CPP + if flag(splitBase) + Build-Depends: regex-base >= 0.93, base >= 3.0, array, containers, bytestring + -- Need the next symbol for using CPP to get Data.ByteString.Base|Unsafe in + -- ./Text/Regex/Posix/ByteString.hs and ./Text/Regex/Posix/ByteString/Lazy.hs + CPP-Options: "-DSPLIT_BASE=1" + Extensions: MultiParamTypeClasses, FunctionalDependencies, CPP, ForeignFunctionInterface, GeneralizedNewtypeDeriving, FlexibleContexts, TypeSynonymInstances, FlexibleInstances + + else + Build-Depends: regex-base >= 0.93, base < 3.0 + Extensions: MultiParamTypeClasses, FunctionalDependencies, CPP -- Data-Files: -- Extra-Source-Files: