summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaelSnoyman <>2011-11-29 05:15:51 (GMT)
committerhdiff <hdiff@luite.com>2011-11-29 05:15:51 (GMT)
commitde0b78ddbf4f378753e0d804fd784ee9eb2f9ba4 (patch)
tree871f701cffa264d5d890fd76f7be983d006c38c6
parent623c42dd0c79a56c0a9dab65ce8e45ee5c46be95 (diff)
version 0.1.10.1.1
-rw-r--r--Text/CSS/Parse.hs5
-rw-r--r--css-text.cabal14
2 files changed, 10 insertions, 9 deletions
diff --git a/Text/CSS/Parse.hs b/Text/CSS/Parse.hs
index c7da1a9..90c7ed0 100644
--- a/Text/CSS/Parse.hs
+++ b/Text/CSS/Parse.hs
@@ -13,7 +13,8 @@ module Text.CSS.Parse
import Prelude hiding (takeWhile)
import Data.Attoparsec.Text
import Data.Text (Text, strip)
-import Control.Applicative ((<|>))
+import Control.Applicative ((<|>), many)
+import Data.Char (isSpace)
parseAttrs :: Text -> Either String [(Text, Text)]
parseAttrs = parseOnly attrsParser
@@ -29,7 +30,7 @@ parseBlock = parseOnly blockParser
skipWS :: Parser ()
skipWS = (string "/*" >> endComment >> skipWS)
- <|> (space >> skipSpace >> skipWS)
+ <|> (skip isSpace >> skipWhile isSpace >> skipWS)
<|> return ()
where
endComment = do
diff --git a/css-text.cabal b/css-text.cabal
index 8d28bb6..da0faf5 100644
--- a/css-text.cabal
+++ b/css-text.cabal
@@ -1,5 +1,5 @@
name: css-text
-version: 0.1.0.1
+version: 0.1.1
license: BSD3
license-file: LICENSE
author: Michael Snoyman <michael@snoyman.com>
@@ -14,8 +14,8 @@ extra-source-files: runtests.hs
library
build-depends: base >= 4 && < 5
- , text >= 0.11 && < 0.12
- , attoparsec-text >= 0.8.5.1 && < 0.9
+ , text >= 0.11
+ , attoparsec >= 0.10
exposed-modules: Text.CSS.Parse
Text.CSS.Render
ghc-options: -Wall
@@ -24,10 +24,10 @@ test-suite runtests
type: exitcode-stdio-1.0
main-is: runtests.hs
build-depends: base >= 4 && < 5
- , text >= 0.11 && < 0.12
- , attoparsec-text >= 0.8.5.1 && < 0.9
- , HUnit >= 1.2 && < 1.3
- , hspec >= 0.6.1 && < 0.7
+ , text >= 0.11
+ , attoparsec >= 0.10
+ , HUnit >= 1.2
+ , hspec >= 0.6.1
, QuickCheck
source-repository head