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

Add T_SourceCommand to wrap source commands and sourced code 

Fixes #1181
This commit is contained in:
Ng Zhi An 2018-05-22 22:43:26 -07:00
parent 77546fba2f
commit 884eff0c36
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ShellCheck/AST.hs
View File

@ -134,7 +134,8 @@ data Token =
| T_Pipe Id String | T_Pipe Id String
| T_CoProc Id (Maybe String) Token | T_CoProc Id (Maybe String) Token
| T_CoProcBody Id Token | T_CoProcBody Id Token
| T_Include Id Token Token -- . & source: SimpleCommand T_Script | T_Include Id Token
| T_SourceCommand Id Token Token
deriving (Show) deriving (Show)
data Annotation = data Annotation =
@ -270,7 +271,8 @@ analyze f g i =
delve (T_Annotation id anns t) = d1 t $ T_Annotation id anns delve (T_Annotation id anns t) = d1 t $ T_Annotation id anns
delve (T_CoProc id var body) = d1 body $ T_CoProc id var delve (T_CoProc id var body) = d1 body $ T_CoProc id var
delve (T_CoProcBody id t) = d1 t $ T_CoProcBody id delve (T_CoProcBody id t) = d1 t $ T_CoProcBody id
delve (T_Include id includer script) = d2 includer script $ T_Include id delve (T_Include id script) = d1 script $ T_Include id
delve (T_SourceCommand id includer t_include) = d2 includer t_include $ T_SourceCommand id
delve t = return t delve t = return t
getId :: Token -> Id getId :: Token -> Id
@ -370,7 +372,8 @@ getId t = case t of
T_Pipe id _ -> id T_Pipe id _ -> id
T_CoProc id _ _ -> id T_CoProc id _ _ -> id
T_CoProcBody id _ -> id T_CoProcBody id _ -> id
T_Include id _ _ -> id T_Include id _ -> id
T_SourceCommand id _ _ -> id
T_UnparsedIndex id _ _ -> id T_UnparsedIndex id _ _ -> id
TC_Empty id _ -> id TC_Empty id _ -> id
TA_Variable id _ _ -> id TA_Variable id _ _ -> id

5
src/ShellCheck/Checks/ShellSupport.hs
View File

@ -283,7 +283,10 @@ checkBashisms = ForShell [Sh, Dash] $ \t -> do
("read", if isDash then ["r", "p"] else ["r"]), ("read", if isDash then ["r", "p"] else ["r"]),
("ulimit", ["f"]) ("ulimit", ["f"])
] ]
bashism t@(T_SourceCommand id src _) =
let name = fromMaybe "" $ getCommandName src
in do
when (name == "source") $ warnMsg id "'source' in place of '.' is"
bashism _ = return () bashism _ = return ()
varChars="_0-9a-zA-Z" varChars="_0-9a-zA-Z"

2
src/ShellCheck/Parser.hs
View File

@ -1922,7 +1922,7 @@ readSource pos t@(T_Redirecting _ _ (T_SimpleCommand _ _ (cmd:file:_))) = do
let included = do let included = do
src <- subRead filename script src <- subRead filename script
return $ T_Include id t src return $ T_SourceCommand id t (T_Include id src)
let failed = do let failed = do
parseNoteAt pos WarningC 1094 parseNoteAt pos WarningC 1094