Merge pull request #1668 from 9rnsr/fix8898

fix Issue 8898 - false positive dangling else warning
dlang · Feb 17, 2013 · 28e6cc1 · 28e6cc1
2 parents 187ed1b + 8cc8a41
commit 28e6cc1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/src/parse.c b/src/parse.c
@@ -309,10 +309,15 @@ Dsymbols *Parser::parseDeclDefs(int once)
                     s = parseStaticAssert();
                 else if (token.value == TOKif)
                 {   condition = parseStaticIfCondition();
-                    Loc lookingForElseSave = lookingForElse;
-                    lookingForElse = loc;
-                    a = parseBlock();
-                    lookingForElse = lookingForElseSave;
+                    if (token.value == TOKcolon)
+                        a = parseBlock();
+                    else
+                    {
+                        Loc lookingForElseSave = lookingForElse;
+                        lookingForElse = loc;
+                        a = parseBlock();
+                        lookingForElse = lookingForElseSave;
+                    }
                     aelse = NULL;
                     if (token.value == TOKelse)
                     {

diff --git a/test/compilable/test8898.d b/test/compilable/test8898.d
@@ -0,0 +1,11 @@
+// REQUIRED_ARGS: -w
+// PERMUTE_ARGS:
+
+static if (true):
+
+version (Foo)
+{
+}
+else
+{
+}