From b58bb4ba9d338d1b2ce8cf690deeb6ac43ce97a1 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sun, 5 Apr 2020 17:26:24 -0400 Subject: [PATCH] Move bracedString to be local to its last use site --- src/ShellCheck/ASTLib.hs | 4 ---- src/ShellCheck/Analytics.hs | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ShellCheck/ASTLib.hs b/src/ShellCheck/ASTLib.hs index 4f49243..efa8cdb 100644 --- a/src/ShellCheck/ASTLib.hs +++ b/src/ShellCheck/ASTLib.hs @@ -134,10 +134,6 @@ isUnquotedFlag token = fromMaybe False $ do str <- getLeadingUnquotedString token return $ "-" `isPrefixOf` str --- Given a T_DollarBraced, return a simplified version of the string contents. -bracedString (T_DollarBraced _ _ l) = concat $ oversimplify l -bracedString _ = error "Internal shellcheck error, please report! (bracedString on non-variable)" - -- Is this an expansion of multiple items of an array? isArrayExpansion (T_DollarBraced _ _ l) = let string = concat $ oversimplify l in diff --git a/src/ShellCheck/Analytics.hs b/src/ShellCheck/Analytics.hs index 23852b1..dd98370 100644 --- a/src/ShellCheck/Analytics.hs +++ b/src/ShellCheck/Analytics.hs @@ -1869,6 +1869,10 @@ checkSpacefulness params = checkSpacefulness' onFind params any (`isPrefixOf` modifier) ["=", ":="] && isParamTo parents ":" token + -- Given a T_DollarBraced, return a simplified version of the string contents. + bracedString (T_DollarBraced _ _ l) = concat $ oversimplify l + bracedString _ = error "Internal shellcheck error, please report! (bracedString on non-variable)" + prop_checkSpacefulness4v= verifyTree checkVerboseSpacefulness "foo=3; foo=$(echo $foo)" prop_checkSpacefulness8v= verifyTree checkVerboseSpacefulness "a=foo\\ bar; a=foo; rm $a" prop_checkSpacefulness28v = verifyTree checkVerboseSpacefulness "exec {n}>&1; echo $n"