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

Don't use & for updates as result is unspecified 

This fixes `Prelude.foldl1: empty list []` when script has `( exit )`
This commit is contained in:
Vidar Holen 2022-07-27 11:29:55 -07:00
parent 4a27c9a8d5
commit a30ac402eb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ShellCheck/CFG.hs
View File

@ -1203,6 +1203,9 @@ tokenToParts t =
_ -> [maybe CFStringUnknown CFStringLiteral $ getLiteralString t] _ -> [maybe CFStringUnknown CFStringLiteral $ getLiteralString t]
-- Like & but well defined when the node already exists
safeUpdate ctx@(_,node,_,_) graph = ctx & (delNode node graph)
-- Change all subshell invocations to instead link directly to their contents. -- Change all subshell invocations to instead link directly to their contents.
-- This is used for producing dominator trees. -- This is used for producing dominator trees.
inlineSubshells :: CFGraph -> CFGraph inlineSubshells :: CFGraph -> CFGraph
@ -1223,7 +1226,7 @@ inlineSubshells graph = relinkedGraph
endToNexts = (endIncoming, endNode, endLabel, outgoing) endToNexts = (endIncoming, endNode, endLabel, outgoing)
(endIncoming, endNode, endLabel, _) = context graph end (endIncoming, endNode, endLabel, _) = context graph end
in in
subshellToStart & (endToNexts & graph) subshellToStart `safeUpdate` (endToNexts `safeUpdate` graph)
findEntryNodes :: CFGraph -> [Node] findEntryNodes :: CFGraph -> [Node]
findEntryNodes graph = ufold find [] graph findEntryNodes graph = ufold find [] graph
@ -1259,7 +1262,7 @@ findPostDominators mainexit graph = asSetMap
inlined = inlineSubshells graph inlined = inlineSubshells graph
terminals = findTerminalNodes inlined terminals = findTerminalNodes inlined
(incoming, _, label, outgoing) = context graph mainexit (incoming, _, label, outgoing) = context graph mainexit
withExitEdges = (incoming ++ map (\c -> (CFEFlow, c)) terminals, mainexit, label, outgoing) & inlined withExitEdges = (incoming ++ map (\c -> (CFEFlow, c)) terminals, mainexit, label, outgoing) `safeUpdate` inlined
reversed = grev withExitEdges reversed = grev withExitEdges
postDoms = dom reversed mainexit postDoms = dom reversed mainexit
asSetMap = M.fromList $ map (\(node, list) -> (node, S.fromList list)) postDoms asSetMap = M.fromList $ map (\(node, list) -> (node, S.fromList list)) postDoms