haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

yesod-test : Fix parsing of descendent selector in CSS query parser.

Browse Source 
Closes #834
This commit is contained in:
Erik de Castro Lopo 2014-10-01 06:24:02 +10:00
parent aaeafb0591
commit 58bf5223c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yesod-test/Yesod/Test/CssQuery.hs
View File

@ -60,10 +60,10 @@ directChildren :: Parser SelectorGroup
directChildren = string "> " >> DirectChildren <$> parseSelectors directChildren = string "> " >> DirectChildren <$> parseSelectors
deepChildren :: Parser SelectorGroup deepChildren :: Parser SelectorGroup
deepChildren = DeepChildren <$> parseSelectors deepChildren = pOptionalTrailingSpace $ DeepChildren <$> parseSelectors
parseSelectors :: Parser [Selector] parseSelectors :: Parser [Selector]
parseSelectors = pOptionalTrailingSpace . many1 $ parseSelectors = many1 $
parseId <|> parseClass <|> parseTag <|> parseAttr parseId <|> parseClass <|> parseTag <|> parseAttr
parseId :: Parser Selector parseId :: Parser Selector
@ -87,7 +87,7 @@ parseAttr = pSquare $ choice
-- | pIdent : Parse an identifier (not yet supporting escapes and unicode as -- | pIdent : Parse an identifier (not yet supporting escapes and unicode as
-- part of the identifier). Basically the regex: [-]?[_a-zA-Z][_a-zA-Z0-9]* -- part of the identifier). Basically the regex: [-]?[_a-zA-Z][_a-zA-Z0-9]*
pIdent :: Parser Text pIdent :: Parser Text
pIdent = pOptionalTrailingSpace $ 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 == '_')