diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,2 @@ # 0.1 -* TODO: Update README.md with all libraries * Initial commit diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ * [`hpc`](http://hackage.haskell.org/package/hpc) * [`old-locale`](http://hackage.haskell.org/package/old-locale) * [`old-time`](http://hackage.haskell.org/package/old-time) +* [`pretty`](http://hackage.haskell.org/package/pretty) * [`random`](http://hackage.haskell.org/package/random) * [`semigroups`](http://hackage.haskell.org/package/semigroups) * [`tagged`](http://hackage.haskell.org/package/tagged) @@ -16,6 +17,7 @@ * [`unix`](http://hackage.haskell.org/package/unix) * [`unordered-containers`](http://hackage.haskell.org/package/unordered-containers) * [`vector`](http://hackage.haskell.org/package/vector) +* [`Win32`](http://hackage.haskell.org/package/Win32) * [`xhtml`](http://hackage.haskell.org/package/xhtml) One can use these instances by importing `Text.Show.Text.Instances`. Alternatively, there are monomorphic versions of the `showb` function available in the other submodules of `Text.Show.Text`. diff --git a/src/Text/Show/Text/Control.hs b/src/Text/Show/Text/Control.hs --- a/src/Text/Show/Text/Control.hs +++ b/src/Text/Show/Text/Control.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Control -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Control/Applicative/Trans.hs b/src/Text/Show/Text/Control/Applicative/Trans.hs --- a/src/Text/Show/Text/Control/Applicative/Trans.hs +++ b/src/Text/Show/Text/Control/Applicative/Trans.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Control.Applicative.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Control/Monad/Trans.hs b/src/Text/Show/Text/Control/Monad/Trans.hs --- a/src/Text/Show/Text/Control/Monad/Trans.hs +++ b/src/Text/Show/Text/Control/Monad/Trans.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-} {-| Module: Text.Show.Text.Control.Monad.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data.hs b/src/Text/Show/Text/Data.hs --- a/src/Text/Show/Text/Data.hs +++ b/src/Text/Show/Text/Data.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Data -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Containers.hs b/src/Text/Show/Text/Data/Containers.hs --- a/src/Text/Show/Text/Data/Containers.hs +++ b/src/Text/Show/Text/Data/Containers.hs @@ -2,7 +2,7 @@ {-# OPTIONS -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Containers -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Functor/Trans.hs b/src/Text/Show/Text/Data/Functor/Trans.hs --- a/src/Text/Show/Text/Data/Functor/Trans.hs +++ b/src/Text/Show/Text/Data/Functor/Trans.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Functor.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/List/NonEmpty.hs b/src/Text/Show/Text/Data/List/NonEmpty.hs --- a/src/Text/Show/Text/Data/List/NonEmpty.hs +++ b/src/Text/Show/Text/Data/List/NonEmpty.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.List.NonEmpty -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Semigroup.hs b/src/Text/Show/Text/Data/Semigroup.hs --- a/src/Text/Show/Text/Data/Semigroup.hs +++ b/src/Text/Show/Text/Data/Semigroup.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Semigroup -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Tagged.hs b/src/Text/Show/Text/Data/Tagged.hs --- a/src/Text/Show/Text/Data/Tagged.hs +++ b/src/Text/Show/Text/Data/Tagged.hs @@ -2,7 +2,7 @@ {-# OPTIONS -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Tagged -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Time.hs b/src/Text/Show/Text/Data/Time.hs --- a/src/Text/Show/Text/Data/Time.hs +++ b/src/Text/Show/Text/Data/Time.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Time -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/UnorderedContainers.hs b/src/Text/Show/Text/Data/UnorderedContainers.hs --- a/src/Text/Show/Text/Data/UnorderedContainers.hs +++ b/src/Text/Show/Text/Data/UnorderedContainers.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.UnorderedContainers -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Data/Vector.hs b/src/Text/Show/Text/Data/Vector.hs --- a/src/Text/Show/Text/Data/Vector.hs +++ b/src/Text/Show/Text/Data/Vector.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Data.Vector -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Graphics.hs b/src/Text/Show/Text/Graphics.hs deleted file mode 100644 --- a/src/Text/Show/Text/Graphics.hs +++ /dev/null @@ -1,16 +0,0 @@ -{-# LANGUAGE CPP #-} -{-| -Module: Text.Show.Text.Graphics -Copyright: (C) 2014 Ryan Scott -License: BSD-style (see the file LICENSE) -Maintainer: Ryan Scott -Stability: Experimental -Portability: GHC - -Imports 'Show' instances for @Graphics@ modules. --} -module Text.Show.Text.Graphics () where - -#if defined(mingw32_HOST_OS) -import Text.Show.Text.Graphics.Win32 () -#endif diff --git a/src/Text/Show/Text/Graphics/Win32.hs b/src/Text/Show/Text/Graphics/Win32.hs deleted file mode 100644 --- a/src/Text/Show/Text/Graphics/Win32.hs +++ /dev/null diff --git a/src/Text/Show/Text/Instances.hs b/src/Text/Show/Text/Instances.hs --- a/src/Text/Show/Text/Instances.hs +++ b/src/Text/Show/Text/Instances.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Instances -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental @@ -13,7 +13,6 @@ module Text.Show.Text.Instances () where import Text.Show.Text.Data () -import Text.Show.Text.Graphics () import Text.Show.Text.Language () import Text.Show.Text.System () import Text.Show.Text.Text () diff --git a/src/Text/Show/Text/Language.hs b/src/Text/Show/Text/Language.hs --- a/src/Text/Show/Text/Language.hs +++ b/src/Text/Show/Text/Language.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Language -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Language/Haskell/TH.hs b/src/Text/Show/Text/Language/Haskell/TH.hs --- a/src/Text/Show/Text/Language/Haskell/TH.hs +++ b/src/Text/Show/Text/Language/Haskell/TH.hs @@ -5,7 +5,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Language.Haskell.TH -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System.hs b/src/Text/Show/Text/System.hs --- a/src/Text/Show/Text/System.hs +++ b/src/Text/Show/Text/System.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Text.Show.Text.System -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Directory.hs b/src/Text/Show/Text/System/Directory.hs --- a/src/Text/Show/Text/System/Directory.hs +++ b/src/Text/Show/Text/System/Directory.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.System.Directory -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Locale.hs b/src/Text/Show/Text/System/Locale.hs --- a/src/Text/Show/Text/System/Locale.hs +++ b/src/Text/Show/Text/System/Locale.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.System.Locale -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Posix.hs b/src/Text/Show/Text/System/Posix.hs --- a/src/Text/Show/Text/System/Posix.hs +++ b/src/Text/Show/Text/System/Posix.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.System.Posix -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Random.hs b/src/Text/Show/Text/System/Random.hs --- a/src/Text/Show/Text/System/Random.hs +++ b/src/Text/Show/Text/System/Random.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.System.Random -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Time.hs b/src/Text/Show/Text/System/Time.hs --- a/src/Text/Show/Text/System/Time.hs +++ b/src/Text/Show/Text/System/Time.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.System.Time -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/System/Win32.hs b/src/Text/Show/Text/System/Win32.hs --- a/src/Text/Show/Text/System/Win32.hs +++ b/src/Text/Show/Text/System/Win32.hs @@ -0,0 +1,116 @@ +{-# LANGUAGE TemplateHaskell #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} +{-| +Module: Text.Show.Text.System.Win32 +Copyright: (C) 2014-2015 Ryan Scott +License: BSD-style (see the file LICENSE) +Maintainer: Ryan Scott +Stability: Experimental +Portability: GHC + +Monomorphic 'Show' functions for data types in the @Win32@ library. +This module is only available on Windows. + +/Since: 0.1/ +-} +module Text.Show.Text.System.Win32 ( + showbDebugEventInfoPrec + , showbExceptionPrec + , showb_BY_HANDLE_FILE_INFORMATION_Prec + , showb_WIN32_FILE_ATTRIBUTE_DATA_Prec + , showbProcessorArchitecturePrec + , showb_SYSTEM_INFO_Prec + , showb_FILETIME_Prec + , showb_SYSTEMTIME_Prec + , showb_TIME_ZONE_INFORMATION_Prec + , showbTimeZoneIdPrec + ) where + +import System.Win32.DebugApi (DebugEventInfo, Exception) +import System.Win32.File (BY_HANDLE_FILE_INFORMATION, WIN32_FILE_ATTRIBUTE_DATA) +import System.Win32.Info (ProcessorArchitecture, SYSTEM_INFO) +import System.Win32.Time (FILETIME, SYSTEMTIME, TIME_ZONE_INFORMATION, TimeZoneId) + +import Text.Show.Text (Builder, showb, showbPrec) +import Text.Show.Text.TH (deriveShowPragmas, defaultInlineShowb, defaultInlineShowbPrec) + +-- | Convert a 'DebugEventInfo' value to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showbDebugEventInfoPrec :: Int -> DebugEventInfo -> Builder +showbDebugEventInfoPrec = showbPrec +{-# INLINE showbDebugEventInfoPrec #-} + +-- | Convert an 'Exception' to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showbExceptionPrec :: Int -> Exception -> Builder +showbExceptionPrec = showbPrec +{-# INLINE showbExceptionPrec #-} + +-- | Convert a 'BY_HANDLE_FILE_INFORMATION' value to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_BY_HANDLE_FILE_INFORMATION_Prec :: Int -> BY_HANDLE_FILE_INFORMATION -> Builder +showb_BY_HANDLE_FILE_INFORMATION_Prec = showbPrec +{-# INLINE showb_BY_HANDLE_FILE_INFORMATION_Prec #-} + +-- | Convert a 'WIN32_FILE_ATTRIBUTE_DATA' value to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_WIN32_FILE_ATTRIBUTE_DATA_Prec :: Int -> WIN32_FILE_ATTRIBUTE_DATA -> Builder +showb_WIN32_FILE_ATTRIBUTE_DATA_Prec = showbPrec +{-# INLINE showb_WIN32_FILE_ATTRIBUTE_DATA_Prec #-} + +-- | Convert a 'ProcessorArchitecture' to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showbProcessorArchitecturePrec :: Int -> ProcessorArchitecture -> Builder +showbProcessorArchitecturePrec = showbPrec +{-# INLINE showbProcessorArchitecturePrec #-} + +-- | Convert a 'SYSTEM_INFO' value to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_SYSTEM_INFO_Prec :: Int -> SYSTEM_INFO -> Builder +showb_SYSTEM_INFO_Prec = showbPrec +{-# INLINE showb_SYSTEM_INFO_Prec #-} + +-- | Convert a 'FILETIME' to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_FILETIME_Prec :: Int -> FILETIME -> Builder +showb_FILETIME_Prec = showbPrec +{-# INLINE showb_FILETIME_Prec #-} + +-- | Convert a 'SYSTEMTIME' to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_SYSTEMTIME_Prec :: Int -> SYSTEMTIME -> Builder +showb_SYSTEMTIME_Prec = showbPrec +{-# INLINE showb_SYSTEMTIME_Prec #-} + +-- | Convert a 'TIME_ZONE_INFORMATION' value to a 'Builder' with the given precedence. +-- +-- /Since: 0.1/ +showb_TIME_ZONE_INFORMATION_Prec :: Int -> TIME_ZONE_INFORMATION -> Builder +showb_TIME_ZONE_INFORMATION_Prec = showbPrec +{-# INLINE showb_TIME_ZONE_INFORMATION_Prec #-} + +-- | Convert a 'TimeZoneId' to a 'Builder'. +-- +-- /Since: 0.1/ +showbTimeZoneIdPrec :: TimeZoneId -> Builder +showbTimeZoneIdPrec = showb +{-# INLINE showbTimeZoneIdPrec #-} + +$(deriveShowPragmas defaultInlineShowbPrec ''DebugEventInfo) +$(deriveShowPragmas defaultInlineShowbPrec ''Exception) +$(deriveShowPragmas defaultInlineShowbPrec ''BY_HANDLE_FILE_INFORMATION) +$(deriveShowPragmas defaultInlineShowbPrec ''WIN32_FILE_ATTRIBUTE_DATA) +$(deriveShowPragmas defaultInlineShowbPrec ''ProcessorArchitecture) +$(deriveShowPragmas defaultInlineShowbPrec ''SYSTEM_INFO) +$(deriveShowPragmas defaultInlineShowbPrec ''FILETIME) +$(deriveShowPragmas defaultInlineShowbPrec ''SYSTEMTIME) +$(deriveShowPragmas defaultInlineShowbPrec ''TIME_ZONE_INFORMATION) +$(deriveShowPragmas defaultInlineShowb ''TimeZoneId) diff --git a/src/Text/Show/Text/Text.hs b/src/Text/Show/Text/Text.hs --- a/src/Text/Show/Text/Text.hs +++ b/src/Text/Show/Text/Text.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Text -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Text/PrettyPrint.hs b/src/Text/Show/Text/Text/PrettyPrint.hs --- a/src/Text/Show/Text/Text/PrettyPrint.hs +++ b/src/Text/Show/Text/Text/PrettyPrint.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Text.PrettyPrint -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Text/XHtml.hs b/src/Text/Show/Text/Text/XHtml.hs --- a/src/Text/Show/Text/Text/XHtml.hs +++ b/src/Text/Show/Text/Text/XHtml.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Text.XHtml -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Trace.hs b/src/Text/Show/Text/Trace.hs --- a/src/Text/Show/Text/Trace.hs +++ b/src/Text/Show/Text/Trace.hs @@ -1,6 +1,6 @@ {-| Module: Text.Show.Text.Trace -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Trace/Hpc.hs b/src/Text/Show/Text/Trace/Hpc.hs --- a/src/Text/Show/Text/Trace/Hpc.hs +++ b/src/Text/Show/Text/Trace/Hpc.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Text.Show.Text.Trace.Hpc -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/src/Text/Show/Text/Utils.hs b/src/Text/Show/Text/Utils.hs --- a/src/Text/Show/Text/Utils.hs +++ b/src/Text/Show/Text/Utils.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP, OverloadedStrings #-} {-| Module: Text.Show.Text.Utils -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Control/Applicative/Trans.hs b/tests/Instances/Control/Applicative/Trans.hs --- a/tests/Instances/Control/Applicative/Trans.hs +++ b/tests/Instances/Control/Applicative/Trans.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Control.Applicative.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Control/Monad/Trans.hs b/tests/Instances/Control/Monad/Trans.hs --- a/tests/Instances/Control/Monad/Trans.hs +++ b/tests/Instances/Control/Monad/Trans.hs @@ -3,7 +3,7 @@ {-# OPTIONS_GHC -fno-warn-orphans -fno-warn-warnings-deprecations #-} {-| Module: Instances.Control.Monad.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Data/Containers.hs b/tests/Instances/Data/Containers.hs --- a/tests/Instances/Data/Containers.hs +++ b/tests/Instances/Data/Containers.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Containers -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Data/Functor/Trans.hs b/tests/Instances/Data/Functor/Trans.hs --- a/tests/Instances/Data/Functor/Trans.hs +++ b/tests/Instances/Data/Functor/Trans.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Functor.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Data/List/NonEmpty.hs b/tests/Instances/Data/List/NonEmpty.hs --- a/tests/Instances/Data/List/NonEmpty.hs +++ b/tests/Instances/Data/List/NonEmpty.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.List.NonEmpty -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Data/Semigroup.hs b/tests/Instances/Data/Semigroup.hs --- a/tests/Instances/Data/Semigroup.hs +++ b/tests/Instances/Data/Semigroup.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Semigroup -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Data/Tagged.hs b/tests/Instances/Data/Tagged.hs --- a/tests/Instances/Data/Tagged.hs +++ b/tests/Instances/Data/Tagged.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Data.Tagged -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Graphics/Win32.hs b/tests/Instances/Graphics/Win32.hs deleted file mode 100644 --- a/tests/Instances/Graphics/Win32.hs +++ /dev/null diff --git a/tests/Instances/Language/Haskell/TH.hs b/tests/Instances/Language/Haskell/TH.hs --- a/tests/Instances/Language/Haskell/TH.hs +++ b/tests/Instances/Language/Haskell/TH.hs @@ -5,7 +5,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Language.Haskell.TH -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental @@ -27,7 +27,7 @@ import Language.Haskell.TH.Syntax #if !(MIN_VERSION_template_haskell(2,8,0)) -import Language.Haskell.TH.Syntax.Internals (ModName(..), PkgName(..), OccName(..)) +import Language.Haskell.TH.Syntax.Internals #endif import Test.Tasty.QuickCheck (Arbitrary(..), oneof) @@ -361,7 +361,9 @@ , SpecialiseInstP <$> arbitrary , RuleP <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary +# if MIN_VERSION_template_haskell(2,9,0) , AnnP <$> arbitrary <*> arbitrary +# endif # if MIN_VERSION_template_haskell(2,10,0) , LineP <$> arbitrary <*> arbitrary # endif @@ -423,16 +425,16 @@ , pure $ AppT fType fType , pure $ SigT fType fKind #if MIN_VERSION_template_haskell(2,6,0) - , UnboxedTupleT <$> arbitrary + , UnboxedTupleT <$> arbitrary #endif -#if MIN_VERSION_template_haskell(2,7,0) - , PromotedT <$> arbitrary +#if MIN_VERSION_template_haskell(2,8,0) + , PromotedT <$> arbitrary , PromotedTupleT <$> arbitrary , pure PromotedNilT , pure PromotedConsT , pure StarT , pure ConstraintT - , LitT <$> arbitrary + , LitT <$> arbitrary #endif #if MIN_VERSION_template_haskell(2,10,0) , pure EqualityT @@ -538,6 +540,12 @@ deriving instance Arbitrary ModName deriving instance Arbitrary OccName deriving instance Arbitrary PkgName + +#if !(MIN_VERSION_template_haskell(2,9,0)) +deriving instance Show ModName +deriving instance Show OccName +deriving instance Show PkgName +#endif ------------------------------------------------------------------------------- -- Workarounds to make Arbitrary instances faster diff --git a/tests/Instances/Miscellaneous.hs b/tests/Instances/Miscellaneous.hs new file mode 100644 --- /dev/null +++ b/tests/Instances/Miscellaneous.hs @@ -0,0 +1,48 @@ +{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, StandaloneDeriving #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} +{-| +Module: Instances.Miscellaneous +Copyright: (C) 2014-2015 Ryan Scott +License: BSD-style (see the file LICENSE) +Maintainer: Ryan Scott +Stability: Experimental +Portability: GHC + +Provides miscellaneous 'Arbitrary' instances (taken from @text-show@). +-} +module Instances.Miscellaneous () where + +#include "HsBaseConfig.h" + +#if !(MIN_VERSION_base(4,8,0)) +import Control.Applicative (pure) +#endif + +import Data.Functor ((<$>)) + +import Foreign.C.Types (CInt(..)) +import Foreign.Ptr (Ptr, nullPtr, plusPtr) + +import System.Exit (ExitCode(..)) +#if defined(HTYPE_GID_T) +import System.Posix.Types (CGid(..)) +#endif +#if defined(HTYPE_UID_T) +import System.Posix.Types (CUid(..)) +#endif + +import Test.Tasty.QuickCheck (Arbitrary(..), oneof) + +instance Arbitrary ExitCode where + arbitrary = oneof [pure ExitSuccess, ExitFailure <$> arbitrary] + +instance Arbitrary (Ptr a) where + arbitrary = plusPtr nullPtr <$> arbitrary + +deriving instance Arbitrary CInt +#if defined(HTYPE_GID_T) +deriving instance Arbitrary CGid +#endif +#if defined(HTYPE_UID_T) +deriving instance Arbitrary CUid +#endif diff --git a/tests/Instances/System/Directory.hs b/tests/Instances/System/Directory.hs --- a/tests/Instances/System/Directory.hs +++ b/tests/Instances/System/Directory.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Directory -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/System/Locale.hs b/tests/Instances/System/Locale.hs --- a/tests/Instances/System/Locale.hs +++ b/tests/Instances/System/Locale.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Locale -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/System/Posix.hs b/tests/Instances/System/Posix.hs --- a/tests/Instances/System/Posix.hs +++ b/tests/Instances/System/Posix.hs @@ -1,8 +1,8 @@ -{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, StandaloneDeriving #-} +{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Posix -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental @@ -18,13 +18,10 @@ import Data.Functor ((<$>)) -import Foreign.C.Types (CInt(..)) -import Foreign.Ptr (Ptr, nullPtr, plusPtr) +import Instances.Miscellaneous () -import System.Exit (ExitCode(..)) import System.Posix.DynamicLinker (RTLDFlags(..), DL(..)) import System.Posix.Process (ProcessStatus(..)) -import System.Posix.Types (CGid(..), CUid(..)) import System.Posix.User (GroupEntry(..), UserEntry(..)) import Test.Tasty.QuickCheck (Arbitrary(..), oneof) @@ -37,7 +34,11 @@ instance Arbitrary ProcessStatus where arbitrary = oneof [ Exited <$> arbitrary +#if MIN_VERSION_unix(2,7,0) , Terminated <$> arbitrary <*> arbitrary +#else + , Terminated <$> arbitrary +#endif , Stopped <$> arbitrary ] @@ -47,17 +48,3 @@ instance Arbitrary UserEntry where arbitrary = UserEntry <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary - -------------------------------------------------------------------------------- --- Miscellaneous Arbitrary instances (taken from text-show) -------------------------------------------------------------------------------- - -instance Arbitrary ExitCode where - arbitrary = oneof [pure ExitSuccess, ExitFailure <$> arbitrary] - -instance Arbitrary (Ptr a) where - arbitrary = plusPtr nullPtr <$> arbitrary - -deriving instance Arbitrary CGid -deriving instance Arbitrary CInt -deriving instance Arbitrary CUid diff --git a/tests/Instances/System/Random.hs b/tests/Instances/System/Random.hs --- a/tests/Instances/System/Random.hs +++ b/tests/Instances/System/Random.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.System.Random -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/System/Win32.hs b/tests/Instances/System/Win32.hs --- a/tests/Instances/System/Win32.hs +++ b/tests/Instances/System/Win32.hs @@ -0,0 +1,102 @@ +{-# LANGUAGE CPP, GeneralizedNewtypeDeriving, StandaloneDeriving #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} +{-| +Module: Instances.System.Win32 +Copyright: (C) 2014-2015 Ryan Scott +License: BSD-style (see the file LICENSE) +Maintainer: Ryan Scott +Stability: Experimental +Portability: GHC + +Provides 'Arbitrary' instances for data types in the @Win32@ library. +-} +module Instances.System.Win32 () where + +#if !(MIN_VERSION_base(4,8,0)) +import Control.Applicative ((<*>), pure) +#endif + +import Data.Functor ((<$>)) + +import Instances.Miscellaneous () + +import System.Win32.DebugApi (DebugEventInfo(..), Exception(..)) +import System.Win32.File (BY_HANDLE_FILE_INFORMATION(..), WIN32_FILE_ATTRIBUTE_DATA(..)) +import System.Win32.Info (ProcessorArchitecture(..), SYSTEM_INFO(..)) +import System.Win32.Time (FILETIME(..), SYSTEMTIME(..), + TIME_ZONE_INFORMATION(..), TimeZoneId(..)) + +import Test.Tasty.QuickCheck (Arbitrary(..), oneof) + +instance Arbitrary DebugEventInfo where + arbitrary = oneof [ pure UnknownDebugEvent + , Exception <$> arbitrary <*> arbitrary + , CreateThread <$> arbitrary + , CreateProcess <$> arbitrary <*> arbitrary <*> arbitrary + , ExitThread <$> arbitrary + , ExitProcess <$> arbitrary + , LoadDll <$> arbitrary + , UnloadDll <$> arbitrary + , DebugString <$> arbitrary <*> arbitrary <*> arbitrary + ] + +instance Arbitrary Exception where + arbitrary = oneof [ pure UnknownException + , AccessViolation <$> arbitrary <*> arbitrary + , pure ArrayBoundsExceeded + , pure Breakpoint + , pure DataTypeMisalignment + , pure FltDenormalOperand + , pure FltDivideByZero + , pure FltInexactResult + , pure FltInvalidOperation + , pure FltOverflow + , pure FltStackCheck + , pure FltUnderflow + , pure IllegalInstruction + , pure InPageError + , pure IntDivideByZero + , pure IntOverflow + , pure InvalidDisposition + , pure NonContinuable + , pure PrivilegedInstruction + , pure SingleStep + , pure StackOverflow + ] + +instance Arbitrary BY_HANDLE_FILE_INFORMATION where + arbitrary = BY_HANDLE_FILE_INFORMATION <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + +instance Arbitrary WIN32_FILE_ATTRIBUTE_DATA where + arbitrary = WIN32_FILE_ATTRIBUTE_DATA <$> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary + +instance Arbitrary ProcessorArchitecture where + arbitrary = oneof [ PaUnknown <$> arbitrary + , pure PaIntel + , pure PaMips + , pure PaAlpha + , pure PaPpc + , pure PaIa64 + , pure PaIa32OnIa64 + , pure PaAmd64 + ] + +instance Arbitrary SYSTEM_INFO where + arbitrary = SYSTEM_INFO <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary + +deriving instance Arbitrary FILETIME + +instance Arbitrary SYSTEMTIME where + arbitrary = SYSTEMTIME <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + +instance Arbitrary TIME_ZONE_INFORMATION where + arbitrary = TIME_ZONE_INFORMATION <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary + <*> arbitrary <*> arbitrary <*> arbitrary + +instance Arbitrary TimeZoneId where + arbitrary = oneof $ map pure [TzIdUnknown, TzIdStandard, TzIdDaylight] diff --git a/tests/Instances/Text/PrettyPrint.hs b/tests/Instances/Text/PrettyPrint.hs --- a/tests/Instances/Text/PrettyPrint.hs +++ b/tests/Instances/Text/PrettyPrint.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Text.PrettyPrint -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Text/XHtml.hs b/tests/Instances/Text/XHtml.hs --- a/tests/Instances/Text/XHtml.hs +++ b/tests/Instances/Text/XHtml.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Text.XHtml -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Instances/Trace/Hpc.hs b/tests/Instances/Trace/Hpc.hs --- a/tests/Instances/Trace/Hpc.hs +++ b/tests/Instances/Trace/Hpc.hs @@ -2,7 +2,7 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-| Module: Instances.Trace.Hpc -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties.hs b/tests/Properties.hs --- a/tests/Properties.hs +++ b/tests/Properties.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Properties -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental @@ -21,9 +21,6 @@ import Properties.Data.Time (timeTests) import Properties.Data.UnorderedContainers (unorderedContainersTests) import Properties.Data.Vector (vectorTests) -#if defined(mingw32_HOST_OS) -import Properties.Graphics.Win32 (win32GraphicsTests) -#endif import Properties.Language.Haskell.TH (templateHaskellTests) import Properties.System.Directory (directoryTests) import Properties.System.Locale (oldLocaleTests) @@ -33,7 +30,7 @@ import Properties.System.Random (randomTests) import Properties.System.Time (oldTimeTests) #if defined(mingw32_HOST_OS) -import Properties.System.Win32 (win32SystemTests) +import Properties.System.Win32 (win32Tests) #endif import Properties.Text.PrettyPrint (prettyTests) import Properties.Text.XHtml (xhtmlTests) @@ -55,9 +52,6 @@ , timeTests , unorderedContainersTests , vectorTests -#if defined(mingw32_HOST_OS) - , win32GraphicsTests -#endif , templateHaskellTests , directoryTests , oldLocaleTests @@ -67,7 +61,7 @@ , randomTests , oldTimeTests #if defined(mingw32_HOST_OS) - , win32SystemTests + , win32Tests #endif , prettyTests , xhtmlTests diff --git a/tests/Properties/Control/Applicative/Trans.hs b/tests/Properties/Control/Applicative/Trans.hs --- a/tests/Properties/Control/Applicative/Trans.hs +++ b/tests/Properties/Control/Applicative/Trans.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Control.Applicative.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Control/Monad/Trans.hs b/tests/Properties/Control/Monad/Trans.hs --- a/tests/Properties/Control/Monad/Trans.hs +++ b/tests/Properties/Control/Monad/Trans.hs @@ -1,7 +1,7 @@ {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} {-| Module: Properties.Control.Monad.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/Containers.hs b/tests/Properties/Data/Containers.hs --- a/tests/Properties/Data/Containers.hs +++ b/tests/Properties/Data/Containers.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.Containers -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/Functor/Trans.hs b/tests/Properties/Data/Functor/Trans.hs --- a/tests/Properties/Data/Functor/Trans.hs +++ b/tests/Properties/Data/Functor/Trans.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.Functor.Trans -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/List/NonEmpty.hs b/tests/Properties/Data/List/NonEmpty.hs --- a/tests/Properties/Data/List/NonEmpty.hs +++ b/tests/Properties/Data/List/NonEmpty.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.List.NonEmpty -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/Semigroup.hs b/tests/Properties/Data/Semigroup.hs --- a/tests/Properties/Data/Semigroup.hs +++ b/tests/Properties/Data/Semigroup.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.Semigroup -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/Tagged.hs b/tests/Properties/Data/Tagged.hs --- a/tests/Properties/Data/Tagged.hs +++ b/tests/Properties/Data/Tagged.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.Tagged -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/Time.hs b/tests/Properties/Data/Time.hs --- a/tests/Properties/Data/Time.hs +++ b/tests/Properties/Data/Time.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.Time -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Data/UnorderedContainers.hs b/tests/Properties/Data/UnorderedContainers.hs --- a/tests/Properties/Data/UnorderedContainers.hs +++ b/tests/Properties/Data/UnorderedContainers.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Data.UnorderedContainers -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Graphics/Win32.hs b/tests/Properties/Graphics/Win32.hs deleted file mode 100644 --- a/tests/Properties/Graphics/Win32.hs +++ /dev/null diff --git a/tests/Properties/Language/Haskell/TH.hs b/tests/Properties/Language/Haskell/TH.hs --- a/tests/Properties/Language/Haskell/TH.hs +++ b/tests/Properties/Language/Haskell/TH.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Properties.Language.Haskell.TH -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Directory.hs b/tests/Properties/System/Directory.hs --- a/tests/Properties/System/Directory.hs +++ b/tests/Properties/System/Directory.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Properties.System.Directory -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Locale.hs b/tests/Properties/System/Locale.hs --- a/tests/Properties/System/Locale.hs +++ b/tests/Properties/System/Locale.hs @@ -1,6 +1,6 @@ {-| Module: Properties.System.Locale -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Posix.hs b/tests/Properties/System/Posix.hs --- a/tests/Properties/System/Posix.hs +++ b/tests/Properties/System/Posix.hs @@ -1,6 +1,6 @@ {-| Module: Properties.System.Posix -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Random.hs b/tests/Properties/System/Random.hs --- a/tests/Properties/System/Random.hs +++ b/tests/Properties/System/Random.hs @@ -1,6 +1,6 @@ {-| Module: Properties.System.Random -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Time.hs b/tests/Properties/System/Time.hs --- a/tests/Properties/System/Time.hs +++ b/tests/Properties/System/Time.hs @@ -1,6 +1,6 @@ {-| Module: Properties.System.Time -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/System/Win32.hs b/tests/Properties/System/Win32.hs --- a/tests/Properties/System/Win32.hs +++ b/tests/Properties/System/Win32.hs @@ -0,0 +1,41 @@ +{-| +Module: Properties.System.Win32 +Copyright: (C) 2014-2015 Ryan Scott +License: BSD-style (see the file LICENSE) +Maintainer: Ryan Scott +Stability: Experimental +Portability: GHC + +@QuickCheck@ properties for data types in the @Win32@ library. +-} +module Properties.System.Win32 (win32Tests) where + +import Instances.System.Win32 () + +import Properties.Utils (prop_matchesShow) + +import System.Win32.DebugApi (DebugEventInfo, Exception) +import System.Win32.File (BY_HANDLE_FILE_INFORMATION, WIN32_FILE_ATTRIBUTE_DATA) +import System.Win32.Info (ProcessorArchitecture, SYSTEM_INFO) +import System.Win32.Time (FILETIME, SYSTEMTIME, TIME_ZONE_INFORMATION, TimeZoneId) + +import Test.Tasty (TestTree, testGroup) +import Test.Tasty.QuickCheck (testProperty) + +import Text.Show.Text.System.Win32 () + +win32Tests :: [TestTree] +win32Tests = + [ testGroup "Text.Show.Text.System.Win32" + [ testProperty "DebugEventInfo instance" (prop_matchesShow :: Int -> DebugEventInfo -> Bool) + , testProperty "Exception instance" (prop_matchesShow :: Int -> Exception -> Bool) + , testProperty "BY_HANDLE_FILE_INFORMATION instance" (prop_matchesShow :: Int -> BY_HANDLE_FILE_INFORMATION -> Bool) + , testProperty "WIN32_FILE_ATTRIBUTE_DATA instance" (prop_matchesShow :: Int -> WIN32_FILE_ATTRIBUTE_DATA -> Bool) + , testProperty "ProcessorArchitecture instance" (prop_matchesShow :: Int -> ProcessorArchitecture -> Bool) + , testProperty "SYSTEM_INFO instance" (prop_matchesShow :: Int -> SYSTEM_INFO -> Bool) + , testProperty "FILETIME instance" (prop_matchesShow :: Int -> FILETIME -> Bool) + , testProperty "SYSTEMTIME instance" (prop_matchesShow :: Int -> SYSTEMTIME -> Bool) + , testProperty "TIME_ZONE_INFORMATION instance" (prop_matchesShow :: Int -> TIME_ZONE_INFORMATION -> Bool) + , testProperty "TimeZoneId instance" (prop_matchesShow :: Int -> TimeZoneId -> Bool) + ] + ] diff --git a/tests/Properties/Text/PrettyPrint.hs b/tests/Properties/Text/PrettyPrint.hs --- a/tests/Properties/Text/PrettyPrint.hs +++ b/tests/Properties/Text/PrettyPrint.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} {-| Module: Properties.Text.PrettyPrint -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Text/XHtml.hs b/tests/Properties/Text/XHtml.hs --- a/tests/Properties/Text/XHtml.hs +++ b/tests/Properties/Text/XHtml.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Text.XHtml -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Trace/Hpc.hs b/tests/Properties/Trace/Hpc.hs --- a/tests/Properties/Trace/Hpc.hs +++ b/tests/Properties/Trace/Hpc.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Trace.Hpc -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/tests/Properties/Utils.hs b/tests/Properties/Utils.hs --- a/tests/Properties/Utils.hs +++ b/tests/Properties/Utils.hs @@ -1,6 +1,6 @@ {-| Module: Properties.Utils -Copyright: (C) 2014 Ryan Scott +Copyright: (C) 2014-2015 Ryan Scott License: BSD-style (see the file LICENSE) Maintainer: Ryan Scott Stability: Experimental diff --git a/text-show-instances.cabal b/text-show-instances.cabal --- a/text-show-instances.cabal +++ b/text-show-instances.cabal @@ -1,29 +1,45 @@ name: text-show-instances -version: 0.1 +version: 0.1.0.1 synopsis: Additional instances for text-show description: @text-show-instances@ is a supplemental library to @text-show@ that provides additional @Show@ instances for data types in common Haskell libraries not encompassed by @text-show@. Currently, @text-show-instances@ covers these libraries: . - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ DONE - * @@ NOT DONE - * @@ DONE + * @@ . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . + * @@ + . One can use these instances by importing "Text.Show.Text.Instances". Alternatively, there are monomorphic versions of the @showb@ function available in the other submodules @@ -35,7 +51,7 @@ author: Ryan Scott maintainer: Ryan Scott stability: Experimental -copyright: (C) 2014 Ryan Scott +copyright: (C) 2014-2015 Ryan Scott category: Text build-type: Simple extra-source-files: CHANGELOG.md, README.md, include/inline.h @@ -46,7 +62,7 @@ location: git://github.com/RyanGlScott/text-show-instances.git flag transformers-four - description: Use a recent version of @transformers@. + description: Use a recent version of transformers. default: True library @@ -72,7 +88,6 @@ Text.Show.Text.Trace.Hpc other-modules: Text.Show.Text.Control Text.Show.Text.Data - Text.Show.Text.Graphics Text.Show.Text.Language Text.Show.Text.System Text.Show.Text.Text @@ -109,8 +124,7 @@ if os(windows) build-depends: Win32 >= 2.1 && < 2.4 - exposed-modules: Text.Show.Text.Graphics.Win32 - Text.Show.Text.System.Win32 + exposed-modules: Text.Show.Text.System.Win32 else build-depends: unix >= 2 && < 2.8 exposed-modules: Text.Show.Text.System.Posix @@ -126,6 +140,7 @@ Instances.Data.Semigroup Instances.Data.Tagged Instances.Language.Haskell.TH + Instances.Miscellaneous Instances.System.Directory Instances.System.Locale Instances.System.Random @@ -181,9 +196,7 @@ if os(windows) build-depends: Win32 >= 2.1 && < 2.4 - other-modules: Instances.Graphics.Win32 - Instances.System.Win32 - Properties.Graphics.Win32 + other-modules: Instances.System.Win32 Properties.System.Win32 else build-depends: unix >= 2 && < 2.8