git.iko.soy/typeable/uuid
on master help sign in
Add UnpackedUUID
89b9013Antoine Latter
Data/UUID/Internal.hs+52
compare with master
unifiedsplit
@@ -28,6 +28,9 @@ module Data.UUID.Internal
28 ,toASCIIBytes
28 ,toASCIIBytes
29 ,fromLazyASCIIBytes
29 ,fromLazyASCIIBytes
30 ,toLazyASCIIBytes
30 ,toLazyASCIIBytes
31+ ,UnpackedUUID(..)
32+ ,pack
33+ ,unpack
31 ) where
34 ) where
32
35
33import Prelude hiding (null)
36import Prelude hiding (null)
@@ -60,6 +63,7 @@ import qualified Data.ByteString.Lazy as BL
60import qualified Data.ByteString.Unsafe as BU
63import qualified Data.ByteString.Unsafe as BU
61
64
62import Data.UUID.Builder
65import Data.UUID.Builder
66+import Data.Word.Util
63
67
64import System.Random
68import System.Random
65
69
@@ -101,6 +105,54 @@ toWords (UUID w1 w2 w3 w4) = (w1, w2, w3, w4)
101fromWords :: Word32 -> Word32 -> Word32 -> Word32 -> UUID
105fromWords :: Word32 -> Word32 -> Word32 -> Word32 -> UUID
102fromWords = UUID
106fromWords = UUID
103
107
108+data UnpackedUUID =
109+ UnpackedUUID {
110+ time_low :: Word32 -- 0-3
111+ , time_mid :: Word16 -- 4-5
112+ , time_hi_and_version :: Word16 -- 6-7
113+ , clock_seq_hi_res :: Word8 -- 8
114+ , clock_seq_low :: Word8 -- 9
115+ , node_0 :: Word8
116+ , node_1 :: Word8
117+ , node_2 :: Word8
118+ , node_3 :: Word8
119+ , node_4 :: Word8
120+ , node_5 :: Word8
121+ }
122+ deriving (Read, Show, Eq, Ord)
123+
124+unpack :: UUID -> UnpackedUUID
125+unpack (UUID w0 w1 w2 w3) =
126+ build /-/ w0 /-/ w1 /-/ w2 /-/ w3
127+
128+ where
129+ build x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 xA xB xC xD xE xF =
130+ UnpackedUUID {
131+ time_low = word x0 x1 x2 x3
132+ , time_mid = w8to16 x4 x5
133+ , time_hi_and_version = w8to16 x6 x7
134+ , clock_seq_hi_res = x8
135+ , clock_seq_low = x9
136+ , node_0 = xA
137+ , node_1 = xB
138+ , node_2 = xC
139+ , node_3 = xD
140+ , node_4 = xE
141+ , node_5 = xF
142+ }
143+
144+pack :: UnpackedUUID -> UUID
145+pack unpacked =
146+ makeFromBytes /-/ (time_low unpacked)
147+ /-/ (time_mid unpacked)
148+ /-/ (time_hi_and_version unpacked)
149+ /-/ (clock_seq_hi_res unpacked)
150+ /-/ (clock_seq_low unpacked)
151+ /-/ (node_0 unpacked) /-/ (node_1 unpacked)
152+ /-/ (node_2 unpacked) /-/ (node_3 unpacked)
153+ /-/ (node_4 unpacked) /-/ (node_5 unpacked)
154+
155+
104--
156--
105-- UTILITIES
157-- UTILITIES
106--
158--
uuid.cabal+2
@@ -38,6 +38,7 @@ Library
38
38
39 Exposed-Modules:
39 Exposed-Modules:
40 Data.UUID
40 Data.UUID
41+ Data.UUID.Util
41 Data.UUID.V1
42 Data.UUID.V1
42 Data.UUID.V3
43 Data.UUID.V3
43 Data.UUID.V4
44 Data.UUID.V4
@@ -47,6 +48,7 @@ Library
47 Data.UUID.Builder
48 Data.UUID.Builder
48 Data.UUID.Internal
49 Data.UUID.Internal
49 Data.UUID.Named
50 Data.UUID.Named
51+ Data.Word.Util
50
52
51 Extensions: DeriveDataTypeable
53 Extensions: DeriveDataTypeable
52 Ghc-Options: -Wall
54 Ghc-Options: -Wall