Merge pull request #122 from callumenator/conditional-fix

Distinguish between conditional dec and stmnt
2014-02-23 16:36:12 -08:00 · 2014-02-23 16:36:12 -08:00 · 9c6c340c74
parent ee940f3d30 083c3f5d41
commit 9c6c340c74
1 changed files with 9 additions and 1 deletions
--- a/stdx/d/parser.d
+++ b/stdx/d/parser.d
@ -6105,7 +6105,15 @@ protected:
            return !peekIs(tok!"switch");
        case tok!"debug":
        case tok!"version":
-            return !peekIs(tok!"=");
+        {
+            if (peekIs(tok!"="))
+                return false;
+
+            auto b = setBookmark();
+            scope (exit) goToBookmark(b);
+            advance();
+            return isDeclaration();
+        }
        case tok!"synchronized":
            if (peekIs(tok!"("))
                return false;