From 0fd09a6316e0be424e6eb454124f0cab6ade40b4 Mon Sep 17 00:00:00 2001 From: PHO Date: Sat, 30 Jul 2011 00:07:17 +0900 Subject: [PATCH] Rakka.Utils: done Ditz-issue: 1c6bfe78f0f9ebd241b8650eb62939dc932cd6f0 --- Rakka.cabal | 1 + Rakka/Utils.hs | 54 +++++++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Rakka.cabal b/Rakka.cabal index 09d8c15..571eba4 100644 --- a/Rakka.cabal +++ b/Rakka.cabal @@ -9,6 +9,7 @@ Author: PHO Maintainer: PHO Stability: experimental Homepage: http://rakka.cielonegro.org/ +Bug-Reports: http://static.cielonegro.org/ditz/Rakka/ Category: Web Tested-With: GHC == 6.12.1 Cabal-Version: >= 1.6 diff --git a/Rakka/Utils.hs b/Rakka/Utils.hs index 9cc0698..7673eb5 100644 --- a/Rakka/Utils.hs +++ b/Rakka/Utils.hs @@ -18,71 +18,71 @@ import qualified Codec.Binary.Url as Url import Control.Arrow import Control.Arrow.ArrowList 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 qualified Data.Text as T 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 - + | c ≡ '/' = True + | isReserved c = False + | isUnreserved c = True + | otherwise = False mkQueryString ∷ [(T.Text, T.Text)] → String {-# INLINEABLE mkQueryString #-} -- 2.40.0