[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36
John Goerzen
jgoerzen at complete.org
Fri Apr 23 15:18:36 UTC 2010
The following commit has been merged in the master branch:
commit ddd121cbefffe90eca7d04a889eed3e54925c396
Author: John Goerzen <jgoerzen at complete.org>
Date: Sun Dec 3 11:01:52 2006 +0100
Renamed MissingH.Str to Data.String
diff --git a/MissingH.cabal b/MissingH.cabal
index a0227ed..8c85d21 100644
--- a/MissingH.cabal
+++ b/MissingH.cabal
@@ -5,7 +5,7 @@ License: GPL
Maintainer: John Goerzen <jgoerzen at complete.org>
Stability: Beta
Copyright: Copyright (c) 2004-2006 John Goerzen
-Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
+Exposed-Modules: Data.String, System.IO, System.IO.Binary, Data.List.Utils,
System.Daemon,
Text.ParserCombinators.Parsec.Utils,
Test.HUnit.Utils,
@@ -18,7 +18,7 @@ Exposed-Modules: MissingH.Str, System.IO, System.IO.Binary, Data.List.Utils,
Language.RFC2234.Parse, Language.RFC2821.Parse,
Language.RFC2822.Parse,
MissingH.Regex.Pesco,
- MissingH.Str.CSV,
+ Data.String.CSV,
System.Cmd.Utils,
Data.Progress.Tracker,
Data.Progress.Meter,
diff --git a/MissingH/Str/CSV.hs b/MissingH/Str/CSV.hs
index 3eeb1cb..1dbd284 100644
--- a/MissingH/Str/CSV.hs
+++ b/MissingH/Str/CSV.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Str.CSV
+ Module : Data.String.CSV
Copyright : Copyright (C) 2005 John Goerzen
License : GNU GPL, version 2 or above
@@ -30,7 +30,7 @@ Haskell Parsec parsers for comma-separated value (CSV) files.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Str.CSV(csvFile, genCsvFile) where
+module Data.String.CSV(csvFile, genCsvFile) where
import Text.ParserCombinators.Parsec
import Data.List
@@ -73,7 +73,7 @@ Here are some examples:
To parse a String, you might use:
>import Text.ParserCombinators.Parsec
->import MissingH.Str.CSV
+>import Data.String.CSV
>....
>parse csvFile "" mystring
diff --git a/renameit.sh b/renameit.sh
index 975435f..6f70d62 100644
--- a/renameit.sh
+++ b/renameit.sh
@@ -44,6 +44,6 @@ do
sed -i "s,`sedname ${OLDNAME}`,${NEWNAME},g" $FILE
done
-darcs record -am "Renamed ${OLDNAME} to ${NEWNAME}, refs #1"
+darcs record -am "Renamed ${OLDNAME} to ${NEWNAME}"
diff --git a/src/Data/ConfigFile.hs b/src/Data/ConfigFile.hs
index 4d19707..0149d9b 100644
--- a/src/Data/ConfigFile.hs
+++ b/src/Data/ConfigFile.hs
@@ -107,7 +107,7 @@ import Data.ConfigFile.Types
import Data.ConfigFile.Parser
import Data.Map.Utils
import Data.Either.Utils
-import MissingH.Str
+import Data.String
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
index c91dc90..4d7bebc 100644
--- a/src/Data/ConfigFile/Parser.hs
+++ b/src/Data/ConfigFile/Parser.hs
@@ -38,7 +38,7 @@ module Data.ConfigFile.Parser
) where
import Text.ParserCombinators.Parsec
import Control.Monad.Error(throwError, MonadError)
-import MissingH.Str
+import Data.String
import Data.ConfigFile.Lexer
import System.IO(Handle, hGetContents)
import Text.ParserCombinators.Parsec.Utils
diff --git a/src/Data/Progress/Meter.hs b/src/Data/Progress/Meter.hs
index ddd0856..05f0ac3 100644
--- a/src/Data/Progress/Meter.hs
+++ b/src/Data/Progress/Meter.hs
@@ -53,7 +53,7 @@ import Data.Progress.Tracker
import Control.Concurrent.MVar
import Control.Concurrent
import Control.Monad(when)
-import MissingH.Str
+import Data.String
import MissingH.Time
import Data.Quantity
import System.IO
diff --git a/MissingH/Str.hs b/src/Data/String.hs
similarity index 98%
rename from MissingH/Str.hs
rename to src/Data/String.hs
index 7cbf3af..98e2d07 100644
--- a/MissingH/Str.hs
+++ b/src/Data/String.hs
@@ -17,7 +17,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-}
{- |
- Module : MissingH.Str
+ Module : Data.String
Copyright : Copyright (C) 2004-2006 John Goerzen
License : GNU GPL, version 2 or above
@@ -30,7 +30,7 @@ This module provides various helpful utilities for dealing with strings.
Written by John Goerzen, jgoerzen\@complete.org
-}
-module MissingH.Str
+module Data.String
(-- * Whitespace Removal
strip, lstrip, rstrip,
-- * Tests
diff --git a/src/Network/Email/Parser.hs b/src/Network/Email/Parser.hs
index f57bf0d..1918a76 100644
--- a/src/Network/Email/Parser.hs
+++ b/src/Network/Email/Parser.hs
@@ -42,7 +42,7 @@ import Text.ParserCombinators.Parsec
import Control.Monad.Error
import Text.ParserCombinators.Parsec.Error
import Text.ParserCombinators.Parsec.Pos(newPos)
-import MissingH.Str
+import Data.String
{- | Given a 'MissingH.Wash.Mail.Message.Message' object, \"flatten\"
it into a simple, non-hierarchical list of its component single parts.
diff --git a/src/Network/FTP/Client.hs b/src/Network/FTP/Client.hs
index aa85732..5e1f138 100644
--- a/src/Network/FTP/Client.hs
+++ b/src/Network/FTP/Client.hs
@@ -230,7 +230,7 @@ import System.IO
import System.IO.Unsafe
import System.Log.Logger
import Network.Utils
-import MissingH.Str
+import Data.String
data FTPConnection = FTPConnection {readh :: IO String,
writeh :: Handle,
socket_internal :: Socket,
diff --git a/src/Network/FTP/Client/Parser.hs b/src/Network/FTP/Client/Parser.hs
index a1fc6e0..cdc2506 100644
--- a/src/Network/FTP/Client/Parser.hs
+++ b/src/Network/FTP/Client/Parser.hs
@@ -49,7 +49,7 @@ import Text.ParserCombinators.Parsec
import Text.ParserCombinators.Parsec.Utils
import Data.List.Utils
import Data.Bits.Utils
-import MissingH.Str
+import Data.String
import System.Log.Logger
import Network.Socket(SockAddr(..), PortNumber(..), inet_addr, inet_ntoa)
import System.IO(Handle, hGetContents)
diff --git a/src/Network/FTP/Server.hs b/src/Network/FTP/Server.hs
index c53be5e..eba1d08 100644
--- a/src/Network/FTP/Server.hs
+++ b/src/Network/FTP/Server.hs
@@ -89,7 +89,7 @@ import System.IO.Error
import System.Log.Logger
import Network.Utils
import Network.Utils.SocketServer
-import MissingH.Str
+import Data.String
import System.IO.HVIO
import System.IO.HVFS
import System.IO.HVFS.InstanceHelpers
diff --git a/src/Network/FTP/Server/Parser.hs b/src/Network/FTP/Server/Parser.hs
index a7206dd..c9c1311 100644
--- a/src/Network/FTP/Server/Parser.hs
+++ b/src/Network/FTP/Server/Parser.hs
@@ -42,7 +42,7 @@ import Text.ParserCombinators.Parsec
import Text.ParserCombinators.Parsec.Utils
import Data.List.Utils
import Data.Bits.Utils
-import MissingH.Str
+import Data.String
import System.Log.Logger
import Network.Socket(SockAddr(..), PortNumber(..), inet_addr, inet_ntoa)
import System.IO(Handle, hGetContents)
diff --git a/src/System/Debian.hs b/src/System/Debian.hs
index 1ffda62..ff9dab8 100644
--- a/src/System/Debian.hs
+++ b/src/System/Debian.hs
@@ -40,7 +40,7 @@ where
import System.Cmd
import System.Debian.ControlParser
import System.Cmd.Utils
-import MissingH.Str
+import Data.String
import System.IO.Unsafe
import System.Exit
diff --git a/src/System/Debian/ControlParser.hs b/src/System/Debian/ControlParser.hs
index ed252e8..1386c48 100644
--- a/src/System/Debian/ControlParser.hs
+++ b/src/System/Debian/ControlParser.hs
@@ -34,7 +34,7 @@ Written by John Goerzen, jgoerzen\@complete.org
module System.Debian.ControlParser(control, depPart)
where
import Text.ParserCombinators.Parsec
-import MissingH.Str
+import Data.String
eol = (try (string "\r\n"))
<|> string "\n" <?> "EOL"
diff --git a/src/System/Log/Logger.hs b/src/System/Log/Logger.hs
index 8931989..22d0df3 100644
--- a/src/System/Log/Logger.hs
+++ b/src/System/Log/Logger.hs
@@ -171,7 +171,7 @@ logger hierarchy. -}
saveGlobalLogger,
updateGlobalLogger
) where
-import MissingH.Str
+import Data.String
import System.Log
import System.Log.Handler(LogHandler)
import qualified System.Log.Handler(handle)
diff --git a/src/System/Path/WildMatch.hs b/src/System/Path/WildMatch.hs
index 4e393e8..85cd3c5 100644
--- a/src/System/Path/WildMatch.hs
+++ b/src/System/Path/WildMatch.hs
@@ -67,7 +67,7 @@ module System.Path.WildMatch (-- * Wildcard matching
where
import Text.Regex
-import MissingH.Str
+import Data.String
{- | Convert a wildcard to an (uncompiled) regular expression.
diff --git a/testsrc/Str/CSVtest.hs b/testsrc/Str/CSVtest.hs
index 8dc901e..495796a 100644
--- a/testsrc/Str/CSVtest.hs
+++ b/testsrc/Str/CSVtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Str.CSVtest(tests) where
import Test.HUnit
-import MissingH.Str.CSV
+import Data.String.CSV
import Text.ParserCombinators.Parsec
test_csv =
diff --git a/testsrc/Strtest.hs b/testsrc/Strtest.hs
index 172a9d3..a0e18a8 100644
--- a/testsrc/Strtest.hs
+++ b/testsrc/Strtest.hs
@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
module Strtest(tests) where
import Test.HUnit
-import MissingH.Str
+import Data.String
import Test.HUnit.Utils
import Text.Regex
import Data.Char
--
haskell-testpack
More information about the Pkg-haskell-commits
mailing list