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

Made lonely dollar not match $'..'

This commit is contained in:
Vidar Holen 2012-11-05 00:25:58 -08:00
parent 3f630d3faa
commit 98f5c48d47
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Shpell/Parser.hs
View File

@ -512,8 +512,9 @@ readVariableName = do
readDollarLonely = do readDollarLonely = do
id <- getNextId id <- getNextId
parseNote StyleC "$ is not used specially and should therefore be escaped"
char '$' char '$'
n <- lookAhead (anyChar <|> (eof >> return '_'))
when (n /= '\'') $ parseNote StyleC "$ is not used specially and should therefore be escaped"
return $ T_Literal id "$" return $ T_Literal id "$"
prop_readHereDoc = isOk readHereDoc "<< foo\nlol\ncow\nfoo" prop_readHereDoc = isOk readHereDoc "<< foo\nlol\ncow\nfoo"
@ -781,11 +782,12 @@ readDoGroup = do
prop_readForClause = isOk readForClause "for f in *; do rm \"$f\"; done" prop_readForClause = isOk readForClause "for f in *; do rm \"$f\"; done"
prop_readForClause2 = isOk readForClause "for f in *; do ..." prop_readForClause2 = isOk readForClause "for f in *; do ..."
prop_readForClause3 = isOk readForClause "for f; do foo; done"
readForClause = do readForClause = do
(T_For id) <- g_For (T_For id) <- g_For
spacing spacing
name <- readVariableName name <- readVariableName
allspacing spacing
values <- readInClause <|> (readSequentialSep >> return []) values <- readInClause <|> (readSequentialSep >> return [])
group <- readDoGroup <|> (allspacing >> eof >> return []) -- stunted support group <- readDoGroup <|> (allspacing >> eof >> return []) -- stunted support
return $ T_ForIn id name values group return $ T_ForIn id name values group