Fix #199

libdparse

@@ -1 +1 @@
-Subproject commit 4bf4e5aa09453570121134a819a4f436275fe3f7
+Subproject commit 52d73335854c12a608e0592181a83a0d6ec12fd5

makefile

@@ -23,7 +23,7 @@ ldc: $(SRC)
 gdc: $(SRC)
 	$(GDC) $(GDC_FLAGS) $^ -obin/dfmt
 
-test: bin/dfmt
+test: debug
 	cd tests && ./test.sh
 
 bin/dfmt-test: $(SRC)

src/dfmt/ast_info.d

@@ -91,7 +91,7 @@ final class FormatVisitor : ASTVisitor
 
     override void visit(const ConditionalDeclaration dec)
     {
-        if (dec.falseDeclaration !is null)
+        if (dec.hasElse)
         {
             auto condition = dec.compileCondition;
             if (condition.versionCondition !is null)

src/dfmt/formatter.d

@@ -773,13 +773,13 @@ private:
         if (currentIs(tok!"if") || currentIs(tok!"version")
                 || (currentIs(tok!"static") && peekIs(tok!"if")))
         {
-            if (indents.top() == tok!"if" || indents.top == tok!"version")
+            if (indents.topIs(tok!"if") || indents.topIs(tok!"version"))
                 indents.pop();
             write(" ");
         }
         else if (!currentIs(tok!"{") && !currentIs(tok!"comment"))
         {
-            if (indents.top() == tok!"if" || indents.top == tok!"version")
+            if (indents.topIs(tok!"if") || indents.topIs(tok!"version"))
                 indents.pop();
             indents.push(tok!"else");
             newline();
@@ -1065,7 +1065,7 @@ private:
 
         regenLineBreakHintsIfNecessary(index);
         if (indents.indentToMostRecent(tok!"enum") != -1
-                && !peekIs(tok!"}") && indents.top == tok!"{" && parenDepth == 0)
+                && !peekIs(tok!"}") && indents.topIs(tok!"{") && parenDepth == 0)
         {
             writeToken();
             newline();