X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=Data%2FURI%2FInternal%2FScheme.hs;h=7b8fd5209bc771c53253d27703c20ada55414b96;hb=4a9daff;hp=2e3ba24efa7ac59a9e2c999910e7275f5713aaf1;hpb=087dd4f3ffb5aba8107c38f2eae0c82545ec21ca;p=Lucu.git

diff --git a/Data/URI/Internal/Scheme.hs b/Data/URI/Internal/Scheme.hs
index 2e3ba24..7b8fd52 100644
--- a/Data/URI/Internal/Scheme.hs
+++ b/Data/URI/Internal/Scheme.hs
@@ -12,7 +12,7 @@ module Data.URI.Internal.Scheme
     ( Scheme
     )
     where
-import Data.Ascii (CIAscii)
+import Data.Ascii (AsciiBuilder, CIAscii)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8
 import qualified Data.ByteString.Char8 as BS
@@ -28,7 +28,8 @@ import Prelude.Unicode
 
 -- |'Scheme' names consist of a non-empty sequence of characters
 -- beginning with a letter and followed by any combination of letters,
--- digits, plus (\'+\'), period (\'.\'), or hyphen (\'-\'):
+-- digits, plus (\'+\'), period (\'.\'), or hyphen (\'-\'). Comparison
+-- of 'Scheme's are always case-insensitive. See:
 -- <http://tools.ietf.org/html/rfc3986#section-3.1>
 newtype Scheme = Scheme CIAscii
     deriving ( Eq
@@ -39,7 +40,7 @@ newtype Scheme = Scheme CIAscii
              , Typeable
              )
 
--- |'isString' is a fast but unsafe way to create 'Scheme' such that
+-- |'fromString' is a fast but unsafe way to create 'Scheme' such that
 -- no validation on the string is performed.
 deriving instance IsString Scheme
 
@@ -56,6 +57,7 @@ instance Default (Parser Scheme) where
           {-# INLINE nonFirst #-}
           nonFirst c
               = isAlpha_ascii c ∨
+                isDigit c       ∨
                 c ≡ '+'         ∨
                 c ≡ '-'         ∨
                 c ≡ '.'
@@ -64,11 +66,16 @@ instance Default (Parser Scheme) where
 
 instance ConvertSuccess Scheme CIAscii where
     {-# INLINE convertSuccess #-}
-    convertSuccess (Scheme s) = s
+    convertSuccess (Scheme s) = foldCase s
+
+instance ConvertSuccess Scheme AsciiBuilder where
+    {-# INLINE convertSuccess #-}
+    convertSuccess = A.toAsciiBuilder ∘ A.fromCIAscii ∘ cs
 
 instance ConvertAttempt CIAscii Scheme where
     {-# INLINE convertAttempt #-}
     convertAttempt = parseAttempt' def ∘ A.fromCIAscii
 
-deriveAttempts [ ([t| Scheme |], [t| CIAscii |])
+deriveAttempts [ ([t| Scheme |], [t| AsciiBuilder |])
+               , ([t| Scheme |], [t| CIAscii      |])
                ]