X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Rakka%2FUtils.hs;h=051685cbf8a93cfedb07258fe44a04e0ac9169d3;hb=bea735cd0409bc96e2962ee9e97cae5f7bf4d585;hp=9cc06984440e09a9d7afe2ec12411f550d1a1f56;hpb=88747f2463963ff2895a597b3054b12b2288530e;p=Rakka.git

diff --git a/Rakka/Utils.hs b/Rakka/Utils.hs
index 9cc0698..051685c 100644
--- a/Rakka/Utils.hs
+++ b/Rakka/Utils.hs
@@ -14,85 +14,96 @@ module Rakka.Utils
     , mkQueryString
     )
     where
-import qualified Codec.Binary.Url as Url
+import qualified Blaze.ByteString.Builder as BBB
 import Control.Arrow
 import Control.Arrow.ArrowList
+import Data.Ascii (Ascii)
+import qualified Data.Ascii as A
 import qualified Data.ByteString as BS
+import qualified Data.ByteString.Unsafe as BS
 import qualified Data.ByteString.Lazy as LS
-import qualified Data.ByteString.Lazy.Char8 as L8
-import Data.List
+import Data.Monoid.Unicode
 import qualified Data.Text as T
+import qualified Data.Text.Lazy as LT
 import Data.Text.Encoding
+import Magic
 import Network.HTTP.Lucu
 import Network.URI
 import Prelude.Unicode
 import System.IO.Unsafe
 
-
 yesOrNo ∷ Bool → String
 yesOrNo True  = "yes"
 yesOrNo False = "no"
 
-
 trueOrFalse ∷ Bool → String
 trueOrFalse True  = "true"
 trueOrFalse False = "false"
 
-
-parseYesOrNo ∷ ArrowChoice a => a String Bool
+parseYesOrNo ∷ ArrowChoice a ⇒ a String Bool
 parseYesOrNo 
     = proc str → do case str of
-                       "yes" → returnA -< True
-                       "no"  → returnA -< False
-                       _     → returnA -< error ("Expected yes or no: " ⧺ str)
+                       "yes" → returnA ⤙ True
+                       "no"  → returnA ⤙ False
+                       _     → returnA ⤙ error ("Expected yes or no: " ⧺ str)
 
-
-maybeA ∷ (ArrowList a, ArrowChoice a) => a b c → a b (Maybe c)
+maybeA ∷ (ArrowList a, ArrowChoice a) ⇒ a b c → a b (Maybe c)
 maybeA a = listA a
            >>>
            proc xs → case xs of
-                        []    → returnA -< Nothing
-                        (x:_) → returnA -< Just x
-
+                        []    → returnA ⤙ Nothing
+                        (x:_) → returnA ⤙ Just x
 
-deleteIfEmpty ∷ (ArrowList a, ArrowChoice a) => a String String
+deleteIfEmpty ∷ (ArrowList a, ArrowChoice a) ⇒ a String String
 deleteIfEmpty
     = proc str → do case str of
-                       "" → none    -< ()
-                       _  → returnA -< str
-
+                       "" → none    ⤙ ()
+                       _  → returnA ⤙ str
 
 chomp ∷ String → String
-chomp = reverse . snd . break (/= '\n') . reverse
-
+{-# INLINE chomp #-}
+chomp = reverse . snd . break (≢ '\n') . reverse
 
 guessMIMEType ∷ LS.ByteString → MIMEType
-guessMIMEType = read . unsafePerformIO . magicString magic . L8.unpack
+{-# INLINEABLE guessMIMEType #-}
+guessMIMEType = read
+                ∘ unsafePerformIO
+                ∘ flip BS.unsafeUseAsCStringLen (magicCString magic)
+                ∘ BS.concat
+                ∘ LS.toChunks
     where
       magic ∷ Magic
+      {-# NOINLINE magic #-}
       magic = unsafePerformIO
-              $ do m <- magicOpen [MagicMime]
+              $ do m ← magicOpen [MagicMime]
                    magicLoadDefault m
                    return m
 
-
 isSafeChar ∷ Char → Bool
+{-# INLINEABLE isSafeChar #-}
 isSafeChar c
-    | c ≡ '/'           = True
-    | isReserved c      = False
-    | isUnreserved c    = True
-    | otherwise         = False
-
-
-mkQueryString ∷ [(T.Text, T.Text)] → String
-{-# INLINEABLE mkQueryString #-}
-mkQueryString = intercalate ";" ∘ map pairToStr
+    | c ≡ '/'        = True
+    | isReserved c   = False
+    | isUnreserved c = True
+    | otherwise      = False
+
+mkQueryString ∷ [(T.Text, T.Text)] → Ascii
+{-# INLINE mkQueryString #-}
+mkQueryString = A.unsafeFromByteString
+                ∘ BBB.toByteString
+                ∘ flip mkBBB (∅)
     where
-      pairToStr ∷ (T.Text, T.Text) → String
-      {-# INLINE pairToStr #-}
-      pairToStr (k, v)
-          = encode k ⧺ ('=':encode v)
-
-      encode ∷ T.Text → String
-      {-# INLINE encode #-}
-      encode = Url.encode ∘ BS.unpack ∘ encodeUtf8
+      mkBBB ∷ [(T.Text, T.Text)] → BBB.Builder → BBB.Builder
+      {-# INLINEABLE mkBBB #-}
+      mkBBB []      acc = acc
+      mkBBB (kv:[]) acc = acc ⊕ pair kv
+      mkBBB (kv:xs) acc = mkBBB xs (acc ⊕ pair kv ⊕ semicolon)
+
+      pair ∷ (T.Text, T.Text) → BBB.Builder
+      {-# INLINE pair #-}
+      pair (k, v)
+          = encodeText k ⊕ equal ⊕ encodeText v
+
+      encodeText ∷ T.Text → BBB.Builder
+      {-# INLINE encodeText #-}
+      encodeText = BBB.fromByteString ∘ URI.encode ∘ encodeUtf8