From 9f66b6432fd8025f115289e6b2a9db1579385634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Sat, 5 Sep 2026 09:57:31 +0200 Subject: Fix parsing of shell argument starting with variable expansion --- src/Parser/Shell.hs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src/Parser/Shell.hs') diff --git a/src/Parser/Shell.hs b/src/Parser/Shell.hs index 8c8ef46..2d6026a 100644 --- a/src/Parser/Shell.hs +++ b/src/Parser/Shell.hs @@ -99,10 +99,24 @@ parseArgument = choice parseArguments :: TestParser (Expr ShellArguments) parseArguments = do arglists <- many $ choice - [ expressionExpansion "shell arguments" <* sc + [ do + off <- stateOffset <$> getParserState + se <- someExpansion + choice + [ do + notFollowedBy space1 + arg <- expansionTypeCheck off "shell argument" se + txt <- parseTextArgument + return $ joinArgument <$> arg <*> txt + , do + expansionTypeCheck off "shell arguments" se <* sc + ] , fmap (ShellArguments . (: [])) <$> parseArgument ] return $ fmap mconcat $ foldr (liftA2 (:)) (Pure []) $ arglists + where + joinArgument (ShellArgument x) y = ShellArguments [ ShellArgument (x <> y) ] + joinArgument ax y = ShellArguments [ ax, ShellArgument y ] parseCommand :: TestParser (Expr ShellCommand) parseCommand = label "shell statement" $ do -- cgit v1.2.3