From 24f91ae711fb382b012d7b2837ea6b9c55a6bca6 Mon Sep 17 00:00:00 2001 From: Vidar Holen Date: Fri, 30 Nov 2012 10:24:35 -0800 Subject: [PATCH] Revert "Added warning for fi }, and not for ) }" This reverts commit ea4176691d476573cf6eac168312dfa89b8525bb. I must have had some crack for breakfast. --- ShellCheck/Parser.hs | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/ShellCheck/Parser.hs b/ShellCheck/Parser.hs index e09b65c..00a84f8 100644 --- a/ShellCheck/Parser.hs +++ b/ShellCheck/Parser.hs @@ -1199,24 +1199,11 @@ readPattern = (readNormalWord `thenSkip` spacing) `sepBy1` (char '|' `thenSkip` readCompoundCommand = do id <- getNextId - -- This is all Bash specific. fi } fails, but ) } works. - cmd <- do - x <- needsSeparator - return (True, x) - <|> do - x <- noSeparator - return (False, x) + cmd <- choice [ readBraceGroup, readArithmeticExpression, readSubshell, readCondition, readWhileClause, readUntilClause, readIfClause, readForClause, readCaseClause, readFunctionDefinition] spacing redirs <- many readIoRedirect - when (fst cmd) $ optional $ do - try . lookAhead $ (spacing >> g_Rbrace) - parseProblem WarningC "Bash requires semicolon or linefeed before the } here." + return $ T_Redirecting id redirs $ cmd - return $ T_Redirecting id redirs $ snd cmd - - where - needsSeparator = choice [ readArithmeticExpression, readCondition, readWhileClause, readUntilClause, readIfClause, readForClause, readCaseClause] - noSeparator = choice [ readBraceGroup, readSubshell, readFunctionDefinition] readCompoundList = readTerm