split code into separate class/instances packages

Author: mauke

.gitignore

@@ -1,5 +1,5 @@
 *.hi
 *.o
 dist/
-t/*.t
-/Setup
+*.t
+Setup

data-default-class/Data/Default/Class.hs

@@ -0,0 +1,40 @@
+{-
+
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+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 the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY LUKAS MAI 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 REGENTS 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.
+
+-}
+
+module Data.Default.Class (
+-- | This module defines a class for types with a default value.
+    Default(..)
+) where
+
+-- | A class for types with a default value.
+class Default a where
+    -- | The default value for this type.
+    def :: a

LICENSE renamed to data-default-class/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010, 2012 Lukas Mai
+Copyright (c) 2013 Lukas Mai
 
 All rights reserved.
 

Makefile renamed to data-default-class/Makefile

@@ -1,5 +1,5 @@
-Name:            data-default
-Version:         0.5.1
+Name:            data-default-class
+Version:         0.0.1
 Cabal-Version:   >= 1.6
 Category:        Data
 Synopsis:        A class for types with a default value
@@ -14,6 +14,5 @@ source-repository head
   location: https://github.com/mauke/data-default
 
 Library
-  Build-Depends:     base >=2 && <5, containers, dlist, old-locale
-  Exposed-Modules:   Data.Default
-  Ghc-Options:       -Wall -O2
+  Build-Depends:     base >=2 && <5
+  Exposed-Modules:   Data.Default.Class

Setup.lhs renamed to data-default-class/Setup.lhs

@@ -1,6 +1,6 @@
 {-
 
-Copyright (c) 2010, 2012 Lukas Mai
+Copyright (c) 2013 Lukas Mai
 
 All rights reserved.
 
@@ -29,38 +29,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 -}
 
-module Data.Default (
--- | This module defines a class for types with a default value. Instances are
--- provided for '()', 'S.Set', 'M.Map', 'Int', 'Integer', 'Float', 'Double',
--- and many others (see below).
-    Default(..)
+module Data.Default.Instances.Base (
+-- | This module defines 'Default' instances for the types 'Int', 'Int8',
+-- 'Int16', 'Int32', 'Int64', 'Word', 'Word8', 'Word16', 'Word32', 'Word64',
+-- 'Integer', 'Float', 'Double', 'Ratio', 'Complex', '(->)', 'IO', 'Maybe',
+-- '()', '[]', 'Ordering', 'Any', 'All', 'Last', 'First', 'Sum', 'Product',
+-- 'Endo', 'Dual', and tuples.
 ) where
 
+import Data.Default.Class
 import Data.Int
 import Data.Word
 import Data.Monoid
 import Data.Ratio
 import Data.Complex
-import qualified Data.Set as S
-import qualified Data.Map as M
-import Data.IntMap (IntMap)
-import Data.IntSet (IntSet)
-import Data.Sequence (Seq)
-import Data.Tree (Tree(..))
-import Data.DList (DList)
-import System.Locale
-
--- | A class for types with a default value.
-class Default a where
-    -- | The default value for this type.
-    def :: a
-
-instance Default (S.Set v) where def = S.empty
-instance Default (M.Map k v) where def = M.empty
-instance Default (IntMap v) where def = mempty
-instance Default IntSet where def = mempty
-instance Default (Seq a) where def = mempty
-instance (Default a) => Default (Tree a) where def = Node def def
 
 instance Default Int where def = 0
 instance Default Int8 where def = 0
@@ -94,14 +76,10 @@ instance (Num a) => Default (Sum a) where def = mempty
 instance (Num a) => Default (Product a) where def = mempty
 instance Default (Endo a) where def = mempty
 
-instance Default (DList a) where def = mempty
-
 instance (Default a) => Default (Dual a) where def = Dual def
 instance (Default a, Default b) => Default (a, b) where def = (def, def)
 instance (Default a, Default b, Default c) => Default (a, b, c) where def = (def, def, def)
 instance (Default a, Default b, Default c, Default d) => Default (a, b, c, d) where def = (def, def, def, def)
 instance (Default a, Default b, Default c, Default d, Default e) => Default (a, b, c, d, e) where def = (def, def, def, def, def)
 instance (Default a, Default b, Default c, Default d, Default e, Default f) => Default (a, b, c, d, e, f) where def = (def, def, def, def, def, def)
 instance (Default a, Default b, Default c, Default d, Default e, Default f, Default g) => Default (a, b, c, d, e, f, g) where def = (def, def, def, def, def, def, def)
-
-instance Default TimeLocale where def = defaultTimeLocale

data-default.cabal renamed to data-default-class/data-default-class.cabal

@@ -0,0 +1,26 @@
+Copyright (c) 2013 Lukas Mai
+
+All rights reserved.
+
+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 the name of the author nor the names of his contributors
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY LUKAS MAI 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 REGENTS 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.

Data/Default.hs renamed to data-default-instances-base/Data/Default/Instances/Base.hs

@@ -0,0 +1,35 @@
+TESTS = $(wildcard t/*.hs)
+
+.PHONY: config build install docs dist test clean
+.PHONY: build-test clean-test
+
+build: dist/setup-config
+	cabal build
+
+config: dist/setup-config
+
+dist/setup-config: *.cabal
+	cabal configure
+
+install: build
+	cabal install
+
+docs: dist/setup-config
+	cabal haddock
+
+dist: build
+	cabal sdist
+
+clean: clean-test
+	cabal clean
+
+test: build-test
+	prove
+
+build-test: $(TESTS:.hs=.t)
+
+clean-test:
+	rm -f $(TESTS:.hs=.t) $(TESTS:.hs=.hi) $(TESTS:.hs=.o)
+
+t/%.t: t/%.hs build
+	ghc -idist/build -Wall -O --make $< -o $@

data-default-instances-base/LICENSE

@@ -0,0 +1,4 @@
+#!/usr/bin/env runhaskell
+> import Distribution.Simple
+> main :: IO ()
+> main = defaultMain