Update the code from playing around with QuickCheck from ch14

Author: dwayne

ch14/qc/Examples.hs

@@ -1,4 +1,4 @@
-Copyright Dwayne Crooks (c) 2016
+Copyright Dwayne Crooks (c) 2017
 
 All rights reserved.
 

ch14/qc/LICENSE

@@ -0,0 +1 @@
+# Kicking around QuickCheck

ch14/qc/README.md

@@ -1,24 +1,19 @@
 name:                qc
 version:             0.1.0.0
-synopsis:            Simple project template from stack
-description:         Please see README.md
 homepage:            https://github.com/dwayne/qc#readme
 license:             BSD3
 license-file:        LICENSE
 author:              Dwayne Crooks
 maintainer:          me@dwaynecrooks.com
-copyright:           2016 Dwayne Crooks
+copyright:           2017 Dwayne Crooks
 category:            Text
 build-type:          Simple
 cabal-version:       >=1.10
+extra-source-files:  README.md
 
-library
-  hs-source-dirs:       .
-  exposed-modules:      CoArbitrary
-                      , Examples
-                      , First
-  ghc-options:          -Wall -fwarn-tabs
-  default-language:     Haskell2010
-  build-depends:        base >= 4.7 && < 5
-                      , hspec
-                      , QuickCheck
+executable qc
+  hs-source-dirs:      src
+  main-is:             Main.hs
+  default-language:    Haskell2010
+  build-depends:       base >= 4.7 && < 5
+                     , QuickCheck

ch14/qc/qc.cabal

@@ -5,14 +5,16 @@ module CoArbitrary where
 import GHC.Generics
 import Test.QuickCheck
 
-data Bool' = True' | False' deriving (Generic)
+
+data Bool' = True' | False' deriving Generic
+
 
 instance CoArbitrary Bool'
 
--- coarbitrary :: CoArbitrary a => a -> Gen b -> Gen b
 
 trueGen :: Gen Int
 trueGen = coarbitrary True' arbitrary
 
+
 falseGen :: Gen Int
 falseGen = coarbitrary False' arbitrary

ch14/qc/CoArbitrary.hs renamed to ch14/qc/src/CoArbitrary.hs

@@ -1,48 +1,76 @@
-module First where
-
--- 14.6 Kicking around QuickCheck
+module Main where
 
+import CoArbitrary
 import Test.QuickCheck
+import Test.QuickCheck.Gen (oneof)
+
+
+main :: IO ()
+main = do
+  sample trivialGen
+
+
+-- Trivial
 
 data Trivial = Trivial deriving (Eq, Show)
 
+
 trivialGen :: Gen Trivial
 trivialGen = return Trivial
 
+
 instance Arbitrary Trivial where
   arbitrary = trivialGen
 
+
+-- Identity
+
 data Identity a = Identity a deriving (Eq, Show)
 
+
 identityGen :: Arbitrary a => Gen (Identity a)
-identityGen = arbitrary >>= return . Identity
--- identityGen = do
---   a <- arbitrary
---   return (Identity a)
+identityGen = do
+  a <- arbitrary
+  return (Identity a)
+
 
 instance Arbitrary a => Arbitrary (Identity a) where
   arbitrary = identityGen
 
+
 identityGenInt :: Gen (Identity Int)
 identityGenInt = identityGen
 
+
+-- Pair
+
 data Pair a b = Pair a b deriving (Eq, Show)
 
+
 pairGen :: (Arbitrary a, Arbitrary b) => Gen (Pair a b)
 pairGen = do
   a <- arbitrary
   b <- arbitrary
   return (Pair a b)
 
+
 instance (Arbitrary a, Arbitrary b) => Arbitrary (Pair a b) where
   arbitrary = pairGen
 
+
 pairGenIntString :: Gen (Pair Int String)
 pairGenIntString = pairGen
 
-data Sum a b = First a | Second b deriving (Eq, Show)
 
--- equal Odds
+-- Sum
+
+data Sum a b
+  = First a
+  | Second b
+  deriving (Eq, Show)
+
+
+-- equal odds for each
 sumGenEqual :: (Arbitrary a, Arbitrary b) => Gen (Sum a b)
 sumGenEqual = do
   a <- arbitrary
@@ -51,29 +79,20 @@ sumGenEqual = do
         , return $ Second b
         ]
 
--- instance (Arbitrary a, Arbitrary b) => Arbitrary (Sum a b) where
---   arbitrary = sumGenEqual
 
 sumGenCharInt :: Gen (Sum Char Int)
 sumGenCharInt = sumGenEqual
 
--- from the QuickCheck library
--- instance Arbitrary a => Arbitrary (Maybe a) where
---   arbitrary = frequency [ (1, return Nothing)
---                         , (3, liftM Just arbitrary)
---                         ]
 
 sumGenFirstPls :: (Arbitrary a, Arbitrary b) => Gen (Sum a b)
 sumGenFirstPls = do
   a <- arbitrary
   b <- arbitrary
-  frequency [ (10, return $ First a)
-            , (1, return $ Second b)
-            ]
+  frequency
+    [ (10, return $ First a)
+    , (1, return $ Second b)
+    ]
+
 
 sumGenCharIntFirst :: Gen (Sum Char Int)
 sumGenCharIntFirst = sumGenFirstPls
-
-main :: IO ()
-main = do
-  sample trivialGen

ch14/qc/First.hs renamed to ch14/qc/src/Main.hs

@@ -1,25 +1,25 @@
 # This file was automatically generated by 'stack init'
-# 
+#
 # Some commonly used options have been documented as comments in this file.
 # For advanced use and comprehensive documentation of the format, please see:
 # http://docs.haskellstack.org/en/stable/yaml_configuration/
 
 # Resolver to choose a 'specific' stackage snapshot or a compiler version.
 # A snapshot resolver dictates the compiler version and the set of packages
 # to be used for project dependencies. For example:
-# 
+#
 # resolver: lts-3.5
 # resolver: nightly-2015-09-21
 # resolver: ghc-7.10.2
 # resolver: ghcjs-0.1.0_ghc-7.10.2
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-5.17
+resolver: lts-8.2
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
-# 
+#
 # packages:
 # - some-directory
 # - https://example.com/foo/bar/baz-0.0.2.tar.gz
@@ -31,7 +31,7 @@ resolver: lts-5.17
 #  subdirs:
 #  - auto-update
 #  - wai
-# 
+#
 # A package marked 'extra-dep: true' will only be built if demanded by a
 # non-dependency (i.e. a user package), and its test suites and benchmarks
 # will not be run. This is useful for tweaking upstream packages.
@@ -49,18 +49,18 @@ extra-package-dbs: []
 
 # Control whether we use the GHC we find on the path
 # system-ghc: true
-# 
+#
 # Require a specific version of stack, using version ranges
 # require-stack-version: -any # Default
-# require-stack-version: ">=1.1"
-# 
+# require-stack-version: ">=1.3"
+#
 # Override the architecture used by stack, especially useful on Windows
 # arch: i386
 # arch: x86_64
-# 
+#
 # Extra directories used by stack for building
 # extra-include-dirs: [/path/to/dir]
 # extra-lib-dirs: [/path/to/dir]
-# 
+#
 # Allow a newer minor version of GHC than the snapshot specifies
 # compiler-check: newer-minor