From 46788e53ba8f39a3886e8c77ae8901155cd1dcf4 Mon Sep 17 00:00:00 2001
From: BBasile <BBasile@users.noreply.github.com>
Date: Thu, 14 Jun 2018 23:29:47 +0200
Subject: [PATCH] Handle do as contract header and handle body as identifier
 (#360)

Handle `do` as contract header and handle `body` as identifier
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>
---
 libdparse                  |  2 +-
 src/dfmt/formatter.d       | 33 +++++++++++++++++++++++++++++----
 src/dfmt/tokens.d          |  2 +-
 tests/allman/do_body.d.ref | 19 +++++++++++++++++++
 tests/do_body.d            |  7 +++++++
 tests/otbs/do_body.d.ref   | 15 +++++++++++++++
 6 files changed, 72 insertions(+), 6 deletions(-)
 create mode 100644 tests/allman/do_body.d.ref
 create mode 100644 tests/do_body.d
 create mode 100644 tests/otbs/do_body.d.ref

diff --git a/libdparse b/libdparse
index 4f3c9ed..086cf06 160000
--- a/libdparse
+++ b/libdparse
@@ -1 +1 @@
-Subproject commit 4f3c9ed6455cc5409c2a570576f8bd994763d652
+Subproject commit 086cf06051bb1f33c94891ba6c39a57f164ee296
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index fc54206..5456f7f 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -283,6 +283,10 @@ private:
         {
             formatKeyword();
         }
+        else if (current.text == "body" && peekBackIsFunctionDeclarationEnding())
+        {
+            formatKeyword();
+        }
         else if (isBasicType(current.type))
         {
             writeToken();
@@ -596,8 +600,10 @@ private:
             indents.pop();
 
         if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in")
-                || peekIs(tok!"out") || peekIs(tok!"body")))
+            || peekIs(tok!"out") || peekIs(tok!"do") || peekIsBody))
+        {
             writeToken();
+        }
         else if (peekIsLiteralOrIdent() || peekIsBasicType())
         {
             writeToken();
@@ -952,9 +958,11 @@ private:
             if (!currentIs(tok!"{") && !currentIs(tok!";"))
                 write(" ");
         }
-        else if (!currentIs(tok!"{") && !currentIs(tok!";")
-                && !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"body"))
+        else if (!currentIs(tok!"{") && !currentIs(tok!";") && !currentIs(tok!"in") &&
+            !currentIs(tok!"out") && !currentIs(tok!"do") && current.text != "body")
+        {
             newline();
+        }
         else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"if"))
         {
             // Hacks to format braced vs non-braced static if declarations.
@@ -1043,7 +1051,12 @@ private:
             if (!currentIs(tok!"{"))
                 newline();
             break;
-        case tok!"body":
+        case tok!"identifier":
+            if (current.text == "body")
+                goto case tok!"do";
+            else
+                goto default;
+        case tok!"do":
             if (!peekBackIs(tok!"}"))
                 newline();
             writeToken();
@@ -1843,6 +1856,18 @@ const pure @safe @nogc:
         return peekImplementation(tokenType, 1, ignoreComments);
     }
 
+    bool peekIsBody() nothrow
+    {
+        return index + 1 < tokens.length && tokens[index + 1].text == "body";
+    }
+
+    bool peekBackIsFunctionDeclarationEnding() nothrow
+    {
+        return peekBackIsOneOf(false, tok!")", tok!"const", tok!"immutable",
+            tok!"inout", tok!"shared", tok!"@", tok!"pure", tok!"nothrow",
+            tok!"return", tok!"scope");
+    }
+
     bool peekBackIsSlashSlash() nothrow
     {
         return index > 0 && tokens[index - 1].type == tok!"comment"
diff --git a/src/dfmt/tokens.d b/src/dfmt/tokens.d
index 55b31c6..952cc31 100644
--- a/src/dfmt/tokens.d
+++ b/src/dfmt/tokens.d
@@ -217,7 +217,7 @@ private string generateFixedLengthCases()
             a => format(`case tok!"%s": return %d + 1;`, a, a.length)).join("\n\t");
 
     string[] identifierTokens = [
-        "abstract", "alias", "align", "asm", "assert", "auto", "body", "bool",
+        "abstract", "alias", "align", "asm", "assert", "auto", "bool",
         "break", "byte", "case", "cast", "catch", "cdouble", "cent", "cfloat", "char", "class",
         "const", "continue", "creal", "dchar", "debug", "default", "delegate", "delete", "deprecated",
         "do", "double", "else", "enum", "export", "extern", "false", "final", "finally", "float",
diff --git a/tests/allman/do_body.d.ref b/tests/allman/do_body.d.ref
new file mode 100644
index 0000000..52fd2ea
--- /dev/null
+++ b/tests/allman/do_body.d.ref
@@ -0,0 +1,19 @@
+import character.body;
+
+void body() @nogc
+in
+{
+}
+body
+{
+    body = null;
+}
+
+void body()
+in
+{
+}
+do
+{
+    body = null;
+}
diff --git a/tests/do_body.d b/tests/do_body.d
new file mode 100644
index 0000000..dc8f3aa
--- /dev/null
+++ b/tests/do_body.d
@@ -0,0 +1,7 @@
+import character.body;
+
+void body() @nogc
+in{} body{body = null;}
+
+void body()
+in{} do{ body = null;}
diff --git a/tests/otbs/do_body.d.ref b/tests/otbs/do_body.d.ref
new file mode 100644
index 0000000..89138ce
--- /dev/null
+++ b/tests/otbs/do_body.d.ref
@@ -0,0 +1,15 @@
+import character.body;
+
+void body() @nogc
+in {
+}
+body {
+    body = null;
+}
+
+void body()
+in {
+}
+do {
+    body = null;
+}