Better enum formatting and whitespace cleanup

src/dfmt.d

@@ -1,28 +1,28 @@
 /*******************************************************************************
-* Boost Software License - Version 1.0 - August 17th, 2003
+ * Boost Software License - Version 1.0 - August 17th, 2003
-*
+ *
-* Permission is hereby granted, free of charge, to any person or organization
+ * Permission is hereby granted, free of charge, to any person or organization
-* obtaining a copy of the software and accompanying documentation covered by
+ * obtaining a copy of the software and accompanying documentation covered by
-* this license (the "Software") to use, reproduce, display, distribute,
+ * this license (the "Software") to use, reproduce, display, distribute,
-* execute, and transmit the Software, and to prepare derivative works of the
+ * execute, and transmit the Software, and to prepare derivative works of the
-* Software, and to permit third-parties to whom the Software is furnished to
+ * Software, and to permit third-parties to whom the Software is furnished to
-* do so, all subject to the following:
+ * do so, all subject to the following:
-*
+ *
-* The copyright notices in the Software and this entire statement, including
+ * The copyright notices in the Software and this entire statement, including
-* the above license grant, this restriction and the following disclaimer,
+ * the above license grant, this restriction and the following disclaimer,
-* must be included in all copies of the Software, in whole or in part, and
+ * must be included in all copies of the Software, in whole or in part, and
-* all derivative works of the Software, unless such copies or derivative
+ * all derivative works of the Software, unless such copies or derivative
-* works are solely in the form of machine-executable object code generated by
+ * works are solely in the form of machine-executable object code generated by
-* a source language processor.
+ * a source language processor.
-*
+ *
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-* SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-* FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-* DEALINGS IN THE SOFTWARE.
+ * DEALINGS IN THE SOFTWARE.
-******************************************************************************/
+ ******************************************************************************/
 
 module dfmt;
 
@@ -36,14 +36,26 @@ import std.array;
 
 int main(string[] args)
 {
-    if (args.length < 2)
+    ubyte[] buffer;
+    if (args.length == 1)
     {
-        writeln("File name is a required argument");
+        ubyte[4096] inputBuffer;
-        return 1;
+        ubyte[] b;
+        while (true)
+        {
+            b = stdin.rawRead(inputBuffer);
+            if (b.length)
+                buffer ~= b;
+            else
+                break;
         }
+    }
+    else
+    {
         File f = File(args[1]);
-    ubyte[] buffer = new ubyte[](f.size);
+        buffer = new ubyte[](f.size);
         f.rawRead(buffer);
+    }
     LexerConfig config;
     config.stringBehavior = StringBehavior.source;
     config.whitespaceBehavior = WhitespaceBehavior.skip;
@@ -54,7 +66,7 @@ int main(string[] args)
     ASTInformation astInformation;
     FormatterConfig formatterConfig;
     auto parseTokens = getTokensForParser(buffer, parseConfig, &cache);
-    auto mod = parseModule(parseTokens, args[1]);
+    auto mod = parseModule(parseTokens, args.length > 1 ? args[1] : "stdin");
     auto visitor = new FormatVisitor(&astInformation);
     visitor.visit(mod);
     astInformation.cleanup();
@@ -87,6 +99,8 @@ struct TokenFormatter
         assert (indentLevel >= 0);
     }
 
+private:
+
     void formatStep()
     {
         import std.range:assumeSorted;
@@ -312,18 +326,21 @@ struct TokenFormatter
             assert (false, str(current.type));
     }
 
+	/// Pushes a temporary indent level
     void pushIndent()
     {
         if (tempIndent == 0)
             tempIndent++;
     }
 
+	/// Pops a temporary indent level
     void popIndent()
     {
         if (tempIndent > 0)
             tempIndent--;
     }
 
+	/// Writes balanced braces
     void writeBraces()
     {
         import std.range : assumeSorted;
@@ -349,6 +366,9 @@ struct TokenFormatter
             }
             else if (current.type == tok!"}")
             {
+				// Silly hack to format enums better.
+                if (peekBackIs(tok!"identifier"))
+                    newline();
                 write("}");
                 depth--;
                 if (index < tokens.length &&
@@ -653,7 +673,7 @@ struct FormatterConfig
     uint columnHardLimit = 120;
 
     /// Use the One True Brace Style
-    BraceStyle braceStyle = BraceStyle.otbs;
+    BraceStyle braceStyle = BraceStyle.allman;
 }
 
 ///
@@ -700,6 +720,12 @@ final class FormatVisitor : ASTVisitor
         functionBody.accept(this);
     }
 
+    override void visit(const EnumBody enumBody)
+    {
+        astInformation.doubleNewlineLocations ~= enumBody.endLocation;
+        enumBody.accept(this);
+    }
+
     override void visit(const Unittest unittest_)
     {
         astInformation.doubleNewlineLocations ~= unittest_.blockStatement.endLocation;