yesod-test : Fix two more CssQuery parser problems.

Closes #834
This commit is contained in:
Erik de Castro Lopo 2014-10-02 20:28:55 +10:00
parent 9d0d48afd6
commit d31e2d0988

View File

@ -57,7 +57,8 @@ rules :: Parser [SelectorGroup]
rules = many $ directChildren <|> deepChildren rules = many $ directChildren <|> deepChildren
directChildren :: Parser SelectorGroup directChildren :: Parser SelectorGroup
directChildren = string "> " >> DirectChildren <$> parseSelectors directChildren =
string "> " >> DirectChildren <$> pOptionalTrailingSpace parseSelectors
deepChildren :: Parser SelectorGroup deepChildren :: Parser SelectorGroup
deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectors deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectors
@ -90,7 +91,7 @@ pIdent :: Parser Text
pIdent = do pIdent = do
leadingMinus <- string "-" <|> pure "" leadingMinus <- string "-" <|> pure ""
nmstart <- T.singleton <$> satisfy (\c -> isAlpha c || c == '_') nmstart <- T.singleton <$> satisfy (\c -> isAlpha c || c == '_')
nmchar <- takeWhile (\c -> isAlphaNum c || c == '_') nmchar <- takeWhile (\c -> isAlphaNum c || c == '_' || c == '-')
return $ T.concat [ leadingMinus, nmstart, nmchar ] return $ T.concat [ leadingMinus, nmstart, nmchar ]