diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,31 +1,12 @@ -The Glasgow Haskell Compiler License +This modile is under this "3 clause" BSD license: -Copyright 2004, The University Court of the University of Glasgow. +Copyright (c) 2007, Christopher Kuklewicz All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright notice, -this list of conditions and the following disclaimer in the documentation -and/or other materials provided with the distribution. - -- Neither name of the University nor the names of its contributors may be -used to endorse or promote products derived from this software without -specific prior written permission. + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * The names of the contributors may not be used to endorse or promote products derived from this software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE UNIVERSITY COURT OF THE UNIVERSITY OF -GLASGOW AND THE CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, -INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -UNIVERSITY COURT OF THE UNIVERSITY OF GLASGOW OR THE CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH -DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/Setup.hs b/Setup.hs new file mode 100644 --- /dev/null +++ b/Setup.hs @@ -0,0 +1,6 @@ +#!/usr/bin/env runhaskell + +-- I usually compile this with "ghc --make -o setup Setup.hs" + +import Distribution.Simple(defaultMain) +main = defaultMain diff --git a/Setup.lhs b/Setup.lhs deleted file mode 100644 --- a/Setup.lhs +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env runhaskell - -> -- I usually compile this with "ghc --make -o setup Setup.hs" - -> module Main (main) where -> -> import Distribution.Simple -> -> main :: IO () -> main = defaultMain - diff --git a/Text/Regex.hs b/Text/Regex.hs --- a/Text/Regex.hs +++ b/Text/Regex.hs @@ -104,8 +104,7 @@ Just (lead, _, trail, bgroups) -> let newval = if (head bgroups) == "\\" then "\\" - else let index :: Int - index = (read (head bgroups)) - 1 + else let index = (read (head bgroups)) - 1 in if index == -1 then match diff --git a/regex-compat.cabal b/regex-compat.cabal --- a/regex-compat.cabal +++ b/regex-compat.cabal @@ -1,8 +1,5 @@ --- **************************************************************** --- To fix for cabal < 1.1.4 comment out the Extra-Source-Files line --- **************************************************************** Name: regex-compat -Version: 0.71.0.1 +Version: 0.90 -- Cabal-Version: >=1.1.4 License: BSD3 License-File: LICENSE @@ -11,22 +8,20 @@ Maintainer: TextRegexLazy@personal.mightyreason.com Stability: Seems to work, passes a few tests Homepage: http://sourceforge.net/projects/lazy-regex --- Package-URL: +Package-URL: http://darcs.haskell.org/packages/regex-unstable/regex-compat/ Synopsis: Replaces/Enhances Text.Regex Description: One module layer over regex-posix to replace Text.Regex Category: Text -Build-Type: Simple Tested-With: GHC -Build-Depends: regex-base, regex-posix, base >= 2.0 +Build-Depends: regex-base >= 0.80 , regex-posix, base >= 2.0 -- Data-Files: --- Extra-Source-Files: Text/Regex/Lazy/TestCompat.hs, Text/Regex/Lazy/TestFull.hs, Text/Regex/Impl/TestContext.hs, TestTextRegexLazy.hs, Example.hs, Example2.hs, lazy.html, README, Makefile +-- Extra-Source-Files: -- Extra-Tmp-Files: Exposed-Modules: Text.Regex Buildable: True -- Other-Modules: --- ********* Be backward compatible until 6.4.2 is futher deployed -- HS-Source-Dirs: "." --- Extensions: +Extensions: MultiParamTypeClasses, FunctionalDependencies GHC-Options: -Wall -Werror -O2 -- GHC-Options: -Wall -Werror -- GHC-Options: -Wall -ddump-minimal-imports