diff --git a/ConfigFile.cabal b/ConfigFile.cabal --- a/ConfigFile.cabal +++ b/ConfigFile.cabal @@ -1,9 +1,9 @@ Name: ConfigFile -Version: 1.0.3 +Version: 1.0.4 License: LGPL Maintainer: John Goerzen Author: John Goerzen -Copyright: Copyright (c) 2004-2006 John Goerzen +Copyright: Copyright (c) 2004-2008 John Goerzen license-file: COPYRIGHT extra-source-files: COPYING Category: Parsing @@ -29,9 +29,10 @@ Data.ConfigFile.Parser Other-Modules: Data.ConfigFile.Lexer Extensions: ExistentialQuantification, OverlappingInstances, - UndecidableInstances + UndecidableInstances, TypeSynonymInstances, FlexibleContexts, + FlexibleInstances Build-Depends: parsec, base, - haskell98, mtl, MissingH>=0.18.0 + haskell98, mtl, MissingH>=1.0.0, containers GHC-Options: -O2 Executable: runtests diff --git a/src/Data/ConfigFile.hs b/src/Data/ConfigFile.hs --- a/src/Data/ConfigFile.hs +++ b/src/Data/ConfigFile.hs @@ -1,5 +1,5 @@ -{- arch-tag: ConfigParser main file -Copyright (C) 2004-2006 John Goerzen +{- +Copyright (C) 2004-2008 John Goerzen This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -18,7 +18,7 @@ {- | Module : Data.ConfigFile - Copyright : Copyright (C) 2004-2006 John Goerzen + Copyright : Copyright (C) 2004-2008 John Goerzen License : GNU LGPL, version 2.1 or above Maintainer : John Goerzen @@ -27,7 +27,7 @@ Configuration file parsing, generation, and manipulation -Copyright (c) 2004-2006 John Goerzen, jgoerzen\@complete.org +Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org This module contains extensive documentation. Please scroll down to the Introduction section to continue reading. -} @@ -107,7 +107,7 @@ import Data.ConfigFile.Parser import Data.Map.Utils import Data.Either.Utils -import Data.String +import Data.String.Utils import qualified Data.Map as Map import Data.List import System.IO(Handle) diff --git a/src/Data/ConfigFile/Parser.hs b/src/Data/ConfigFile/Parser.hs --- a/src/Data/ConfigFile/Parser.hs +++ b/src/Data/ConfigFile/Parser.hs @@ -1,5 +1,5 @@ -{- arch-tag: ConfigParser parser support -Copyright (C) 2004 John Goerzen +{- +Copyright (C) 2004-2008 John Goerzen This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -18,7 +18,7 @@ {- | Module : Data.ConfigFile.Parser - Copyright : Copyright (C) 2004 John Goerzen + Copyright : Copyright (C) 2004-2008 John Goerzen License : GNU LGPL, version 2.1 or above Maintainer : John Goerzen @@ -28,7 +28,7 @@ Parser support for "Data.ConfigFile". This module is not intended to be used directly by your programs. -Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org +Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org -} module Data.ConfigFile.Parser ( @@ -38,7 +38,7 @@ ) where import Text.ParserCombinators.Parsec import Control.Monad.Error(throwError, MonadError) -import Data.String +import Data.String.Utils import Data.ConfigFile.Lexer import System.IO(Handle, hGetContents) import Text.ParserCombinators.Parsec.Utils diff --git a/src/Data/ConfigFile/Types.hs b/src/Data/ConfigFile/Types.hs --- a/src/Data/ConfigFile/Types.hs +++ b/src/Data/ConfigFile/Types.hs @@ -1,5 +1,5 @@ -{- arch-tag: ConfigParser types -Copyright (C) 2004-2005 John Goerzen +{- +Copyright (C) 2004-2008 John Goerzen This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -18,7 +18,7 @@ {- | Module : Data.ConfigFile.Types - Copyright : Copyright (C) 2004-2005 John Goerzen + Copyright : Copyright (C) 2004-2008 John Goerzen License : GNU LGPL, version 2.1 or above Maintainer : John Goerzen @@ -28,7 +28,7 @@ Internal types for "Data.ConfigFile". This module is not intended to be used directly by your programs. -Copyright (c) 2004 John Goerzen, jgoerzen\@complete.org +Copyright (c) 2004-2008 John Goerzen, jgoerzen\@complete.org -} module Data.ConfigFile.Types ( diff --git a/testsrc/runtests.hs b/testsrc/runtests.hs deleted file mode 100644 --- a/testsrc/runtests.hs +++ /dev/null @@ -1,25 +0,0 @@ -{- arch-tag: Test runner -Copyright (C) 2004 John Goerzen - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --} - -module Main where - -import Test.HUnit -import Tests - -main = runTestTT tests -