7x31
/
shellcheck
mirror of https://github.com/koalaman/shellcheck.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix parsing {} in regex

This commit is contained in:
Vidar Holen 2014-05-13 19:20:34 -07:00
parent b069f7ed27
commit fdce0116da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ShellCheck/Parser.hs
View File

@ -408,7 +408,7 @@ readConditionContents single = do
where where
readGlobLiteral = do readGlobLiteral = do
id <- getNextId id <- getNextId
s <- many1 (extglobStart <|> oneOf "[]$") s <- many1 (extglobStart <|> oneOf "{}[]$")
return $ T_Literal id s return $ T_Literal id s
readGroup = called "regex grouping" $ do readGroup = called "regex grouping" $ do
id <- getNextId id <- getNextId
@ -637,6 +637,7 @@ prop_readCondition9 = isOk readCondition "[ foo -a -f bar ]"
prop_readCondition10= isOk readCondition "[[ a == b \n || c == d ]]" prop_readCondition10= isOk readCondition "[[ a == b \n || c == d ]]"
prop_readCondition11= isOk readCondition "[[ a == b || \n c == d ]]" prop_readCondition11= isOk readCondition "[[ a == b || \n c == d ]]"
prop_readCondition12= isWarning readCondition "[ a == b \n -o c == d ]" prop_readCondition12= isWarning readCondition "[ a == b \n -o c == d ]"
prop_readCondition13= isOk readCondition "[[ foo =~ ^fo{1,3}$ ]]"
readCondition = called "test expression" $ do readCondition = called "test expression" $ do
opos <- getPosition opos <- getPosition
id <- getNextId id <- getNextId