From 45d5896cf8e6b063a83c784fbd85e290047279fd Mon Sep 17 00:00:00 2001
From: Vidar Holen <spam@vidarholen.net>
Date: Fri, 16 Nov 2012 21:30:52 -0800
Subject: [PATCH] More helpful errors for partial if statements

---
 ShellCheck/Parser.hs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ShellCheck/Parser.hs b/ShellCheck/Parser.hs
index ccf42f3..ab158c0 100644
--- a/ShellCheck/Parser.hs
+++ b/ShellCheck/Parser.hs
@@ -851,27 +851,41 @@ prop_readIfClause2 = isWarning readIfClause "if false; then; echo oo; fi"
 prop_readIfClause3 = isWarning readIfClause "if false; then true; else; echo lol; fi"
 readIfClause = do
     id <- getNextId
+    pos <- getPosition
     (condition, action) <- readIfPart
     elifs <- many readElifPart
     elses <- option [] readElsePart
-    g_Fi
+    g_Fi <|> (do
+                eof
+                parseProblemAt pos ErrorC "Can't find 'fi' for this if. Make sure it's preceeded by a ; or \\n"
+                fail "lol"
+             )
     return $ T_IfExpression id ((condition, action):elifs) elses
 
+checkIfNotSpecial pos key stuff = do
+    eof
+    let f (T_Literal id str) | str == key = parseProblemAt pos ErrorC $ "You need a \\n or ; before '"++ key ++ "' to make it special"
+        f t  = return ()
+    mapM (doAnalysis f) stuff
+    fail "lol"
+
 readIfPart = do
     g_If
     allspacing
+    pos <- getPosition
     condition <- readTerm
-    g_Then
+    g_Then <|> (checkIfNotSpecial pos "then" condition)
     acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'"
     allspacing
     action <- readTerm
     return (condition, action)
 
 readElifPart = do
+    pos <- getPosition
     g_Elif
     allspacing
     condition <- readTerm
-    g_Then
+    g_Then <|> (checkIfNotSpecial pos "then" condition)
     acceptButWarn g_Semi ErrorC "No semicolons directly after 'then'"
     allspacing
     action <- readTerm