From c80e1a067e297eb5cb84facd6cc8a27ef0321bd8 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Mon, 11 Jan 2016 14:30:40 -0800
Subject: [PATCH] Fix #199

---
 libdparse            | 2 +-
 makefile             | 2 +-
 src/dfmt/ast_info.d  | 2 +-
 src/dfmt/formatter.d | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libdparse b/libdparse
index 4bf4e5a..52d7333 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit 4bf4e5aa09453570121134a819a4f436275fe3f7
+Subproject commit 52d73335854c12a608e0592181a83a0d6ec12fd5
diff --git a/makefile b/makefile
index fcafe1c..bd3a7ea 100644
--- a/makefile
+++ b/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)
diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d
index c017229..9a9c0f1 100644
--- a/src/dfmt/ast_info.d
+++ b/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)
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 6bc32e0..e22a9b1 100644
--- a/src/dfmt/formatter.d
+++ b/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();