Replace exported constructors with deprecated pattern

Author: Shimuuar

vector/src/Data/Vector/Mutable.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Mutable
 -- Copyright   : (c) Roman Leshchinskiy 2008-2010
@@ -20,7 +21,8 @@
 
 module Data.Vector.Mutable (
   -- * Mutable boxed vectors
-  MVector(MVector), IOVector, STVector,
+  MVector, IOVector, STVector,
+  pattern MVector,
 
   -- * Accessors
 
@@ -72,13 +74,19 @@ module Data.Vector.Mutable (
 ) where
 
 import qualified Data.Vector.Generic.Mutable as G
-import           Data.Vector.Mutable.Unsafe
+import           Data.Vector.Mutable.Unsafe (MVector,IOVector,STVector,toMutableArray,fromMutableArray)
+import qualified Data.Vector.Mutable.Unsafe as U
+import           Data.Primitive.Array
 import           Control.Monad.Primitive
 
 import Prelude( Ord, Bool, Ordering(..), Int, Maybe )
 
 #include "vector.h"
 
+pattern MVector :: Int -> Int -> MutableArray s a -> MVector s a
+pattern MVector i j arr = U.MVector i j arr
+{-# COMPLETE MVector #-}
+{-# DEPRECATED MVector "Use constructor exported from Data.Vector.Mutable.Unsafe" #-}
 
 
 -- Length information

vector/src/Data/Vector/Primitive.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Primitive
 -- Copyright   : (c) Roman Leshchinskiy 2008-2010
@@ -24,7 +25,7 @@
 
 module Data.Vector.Primitive (
   -- * Primitive vectors
-  Vector(..), MVector(..),
+  Vector, MVector, pattern MVector, pattern Vector,
 
   -- * Accessors
 
@@ -163,9 +164,12 @@ module Data.Vector.Primitive (
 
 import           Control.Applicative (Applicative)
 import qualified Data.Vector.Generic           as G
-import           Data.Vector.Primitive.Unsafe  (Vector(..),unsafeCoerceVector,unsafeCast)
-import           Data.Vector.Primitive.Mutable.Unsafe (MVector(..))
+import           Data.Vector.Primitive.Unsafe  (Vector,unsafeCoerceVector,unsafeCast)
+import qualified Data.Vector.Primitive.Unsafe  as U
+import           Data.Vector.Primitive.Mutable.Unsafe (MVector)
+import           Data.Vector.Primitive.Mutable (pattern MVector)
 import           Data.Primitive ( Prim )
+import           Data.Primitive.ByteArray
 
 import Control.Monad.ST ( ST )
 import Control.Monad.Primitive
@@ -174,6 +178,10 @@ import Prelude
   ( Eq, Ord, Num, Enum, Monoid, Traversable, Monad, Bool, Ordering(..), Int, Maybe, Either
   , (==))
 
+pattern Vector :: Int -> Int -> ByteArray -> Vector a
+pattern Vector i j arr = U.Vector i j arr
+{-# COMPLETE Vector #-}
+{-# DEPRECATED Vector "Use constructor exported from Data.Vector.Primitive.Unsafe" #-}
 
 -- Length
 -- ------

vector/src/Data/Vector/Primitive/Mutable.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Primitive.Mutable
 -- Copyright   : (c) Roman Leshchinskiy 2008-2010
@@ -19,7 +20,8 @@
 
 module Data.Vector.Primitive.Mutable (
   -- * Mutable vectors of primitive types
-  MVector(..), IOVector, STVector,
+  MVector, IOVector, STVector,
+  pattern MVector,
 
   -- * Accessors
 
@@ -71,14 +73,22 @@ module Data.Vector.Primitive.Mutable (
 
 import qualified Data.Vector.Generic.Mutable as G
 import           Data.Primitive ( Prim )
+import           Data.Primitive.ByteArray
 import           Data.Vector.Primitive.Mutable.Unsafe
   (MVector,IOVector,STVector,unsafeCoerceMVector,unsafeCast)
+import qualified Data.Vector.Primitive.Mutable.Unsafe as U
 import           Control.Monad.Primitive
 
 import Prelude ( Ord, Bool, Int, Maybe, Ordering(..) )
 
 #include "vector.h"
 
+
+pattern MVector :: Int -> Int -> MutableByteArray s -> MVector s a
+pattern MVector i j arr = U.MVector i j arr
+{-# COMPLETE MVector #-}
+{-# DEPRECATED MVector "Use constructor exported from Data.Vector.Primitive.Mutable.Unsafe" #-}
+
 -- Length information
 -- ------------------
 

vector/src/Data/Vector/Storable.hs

@@ -5,6 +5,7 @@
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Storable
 -- Copyright   : (c) Roman Leshchinskiy 2009-2010
@@ -21,7 +22,7 @@
 
 module Data.Vector.Storable (
   -- * Storable vectors
-  Vector, MVector(..),
+  Vector, MVector, pattern MVector,
 
   -- * Accessors
 
@@ -169,7 +170,7 @@ module Data.Vector.Storable (
 
 import           Control.Applicative (Applicative)
 import qualified Data.Vector.Generic          as G
-import           Data.Vector.Storable.Mutable ( MVector(..) )
+import           Data.Vector.Storable.Mutable ( MVector, pattern MVector )
 import Data.Vector.Storable.Unsafe
 
 import Control.Monad.ST ( ST )

vector/src/Data/Vector/Storable/Mutable.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE RoleAnnotations #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Storable.Mutable
 -- Copyright   : (c) Roman Leshchinskiy 2009-2010
@@ -20,7 +21,8 @@
 
 module Data.Vector.Storable.Mutable(
   -- * Mutable vectors of 'Storable' types
-  MVector(..), IOVector, STVector,
+  MVector, IOVector, STVector,
+  pattern MVector,
 
   -- * Accessors
 
@@ -77,17 +79,25 @@ module Data.Vector.Storable.Mutable(
 ) where
 
 import qualified Data.Vector.Generic.Mutable as G
-import Data.Vector.Storable.Mutable.Unsafe
-
+import Data.Vector.Storable.Mutable.Unsafe(
+  MVector,IOVector,STVector,unsafeCast,unsafeWith,unsafeCoerceMVector,
+  unsafeToForeignPtr,unsafeToForeignPtr0,unsafeFromForeignPtr,unsafeFromForeignPtr0)
+import qualified Data.Vector.Storable.Mutable.Unsafe as U
 import Foreign.Storable
 
 import Control.Monad.Primitive
+import Foreign.ForeignPtr (ForeignPtr)
 
 import Prelude (Int, Ord, Bool, Maybe, Ordering(..) )
 
 #include "vector.h"
 
 
+pattern MVector :: Int -> ForeignPtr a -> MVector s a
+pattern MVector i ptr = U.MVector i ptr
+{-# COMPLETE MVector #-}
+{-# DEPRECATED MVector "Use constructor exported from Data.Vector.Strict.Mutable.Unsafe" #-}
+
 
 -- Length information
 -- ------------------

vector/src/Data/Vector/Storable/Unsafe.hs

@@ -16,7 +16,7 @@ module Data.Vector.Storable.Unsafe
   ) where
 
 import qualified Data.Vector.Generic          as G
-import           Data.Vector.Storable.Mutable ( MVector(..) )
+import           Data.Vector.Storable.Mutable.Unsafe ( MVector(..) )
 import Data.Vector.Storable.Internal
 import qualified Data.Vector.Fusion.Bundle as Bundle
 

vector/src/Data/Vector/Strict/Mutable.hs

@@ -6,6 +6,7 @@
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE PatternSynonyms #-}
 -- |
 -- Module      : Data.Vector.Strict.Mutable
 -- Copyright   : (c) Roman Leshchinskiy 2008-2010
@@ -24,7 +25,8 @@
 -- are set to ⊥.
 module Data.Vector.Strict.Mutable (
   -- * Mutable boxed vectors
-  MVector(MVector), IOVector, STVector,
+  MVector, IOVector, STVector,
+  pattern MVector,
 
   -- * Accessors
 
@@ -77,13 +79,20 @@ module Data.Vector.Strict.Mutable (
 ) where
 
 import qualified Data.Vector.Generic.Mutable as G
+import qualified Data.Vector.Mutable         as MV
 import           Data.Vector.Strict.Mutable.Unsafe
+  (MVector,IOVector,STVector,toLazy,fromLazy,toMutableArray,fromMutableArray)
+import qualified Data.Vector.Strict.Mutable.Unsafe as U
 import           Control.Monad.Primitive
 
 import Prelude ( Ord, Bool, Int, Maybe, Ordering(..))
 
 #include "vector.h"
 
+pattern MVector :: MV.MVector s a -> MVector s a
+pattern MVector v = U.MVector v
+{-# COMPLETE MVector #-}
+{-# DEPRECATED MVector "Use constructor exported from Data.Vector.Strict.Unsafe" #-}
 
 
 -- Length information

vector/src/Data/Vector/Strict/Unsafe.hs

@@ -22,7 +22,7 @@ module Data.Vector.Strict.Unsafe
 
 
 import Data.Coerce
-import Data.Vector.Strict.Mutable  ( MVector(..) )
+import Data.Vector.Strict.Mutable.Unsafe  ( MVector(..) )
 import Data.Primitive.Array
 import qualified Data.Vector.Generic as G
 import Data.Vector.Generic ((!))