Factor out some new libraries

	word64-map:
		Data.Word64Map
	network-addr:
		Network.Address
	tox-crypto:
		Crypto.Tox
	lifted-concurrent:
		Control.Concurrent.Lifted.Instrument
		Control.Concurrent.Async.Lifted.Instrument
	psq-wrap:
		Data.Wrapper.PSQInt
		Data.Wrapper.PSQ
	minmax-psq:
		Data.MinMaxPSQ
        tasks:
                Control.Concurrent.Tasks
	kad:
		Network.Kademlia
		Network.Kademlia.Bootstrap
		Network.Kademlia.Routing
		Network.Kademlia.CommonAPI
		Network.Kademlia.Persistence
		Network.Kademlia.Search

1 files changed, 59 insertions, 0 deletions

diff --git a/dht/Presence/ByteStringOperators.hs b/dht/Presence/ByteStringOperators.hs
new file mode 100644
index 00000000..e8485134
--- /dev/null
+++ b/dht/Presence/ByteStringOperators.hs
@@ -0,0 +1,59 @@
+{-# LANGUAGE CPP #-}
+module ByteStringOperators where
+
+import qualified Data.ByteString as S (ByteString)
+import Data.ByteString.Lazy.Char8 as L 
+import Control.Applicative
+
+#if MIN_VERSION_bytestring(0,10,0)
+#else
+-- These two were imported to provide an NFData instance.
+import qualified Data.ByteString.Lazy.Internal as L (ByteString(..))
+import Control.DeepSeq
+#endif
+
+
+(<++>) :: ByteString -> ByteString -> ByteString
+(<++.>) :: ByteString -> S.ByteString -> ByteString
+(<.++>) :: S.ByteString -> ByteString -> ByteString
+(<.++.>) :: S.ByteString -> S.ByteString -> ByteString
+a <++> b =  L.append a b
+a <++.> b = L.append a (fromChunks [b])
+a <.++> b = L.append (fromChunks [a]) b
+a <.++.> b = fromChunks [a,b]
+infixr 5 <.++.>
+infixr 5 <.++>
+infixr 5 <++>
+infixr 5 <++.>
+
+
+(<++$>) :: Functor f => ByteString -> f ByteString -> f ByteString
+(<$++>) :: Functor f => f ByteString -> ByteString -> f ByteString
+(<$++$>) :: Applicative f => f ByteString -> f ByteString -> f ByteString
+a <++$> b = fmap (a<++>) b
+a <$++> b = fmap (<++>b) a
+a <$++$> b = liftA2 (<++>) a b
+infixr 6 <++$>
+infixr 6 <$++>
+infixr 6 <$++$>
+
+(<?++>) :: Maybe ByteString -> ByteString -> ByteString
+Nothing <?++> b = b
+Just a  <?++> b = a <++> b
+infixr 5 <?++>
+
+(<++?>) :: ByteString -> Maybe ByteString -> ByteString
+a <++?> Nothing = a
+a <++?> Just b  = a <++> b
+infixr 5 <++?>
+
+bshow :: Show a => a -> ByteString
+bshow = L.pack . show
+
+
+#if MIN_VERSION_bytestring(0,10,0)
+#else
+instance NFData L.ByteString where
+    rnf L.Empty       = ()
+    rnf (L.Chunk _ b) = rnf b
+#endif