From 87866f8fcd10e76ce8c08d2872dec54195b23fc9 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Mon, 20 Apr 2015 00:07:33 -0700 Subject: [PATCH] Fix #31 --- .editorconfig | 5 +++++ README.md | 2 +- src/dfmt/config.d | 26 ++++++++++++++++--------- src/dfmt/formatter.d | 11 +++++++++-- src/dfmt/main.d | 37 +++++++++++++++++++++++++++--------- tests/allman/.d.ref | 0 tests/allman/issue0031.d.ref | 6 ++++++ tests/gen_expected.sh | 9 +++++++-- tests/issue0031.args | 1 + tests/issue0031.d | 6 ++++++ tests/otbs/.d.ref | 0 tests/otbs/issue0031.d.ref | 5 +++++ tests/test | 16 ++++++++++++++++ tests/test.sh | 8 +++++++- 14 files changed, 108 insertions(+), 24 deletions(-) create mode 100644 tests/allman/.d.ref create mode 100644 tests/allman/issue0031.d.ref create mode 100644 tests/issue0031.args create mode 100644 tests/issue0031.d create mode 100644 tests/otbs/.d.ref create mode 100644 tests/otbs/issue0031.d.ref create mode 100755 tests/test diff --git a/.editorconfig b/.editorconfig index 64f936f..c379d53 100644 --- a/.editorconfig +++ b/.editorconfig @@ -3,6 +3,11 @@ trim_trailing_whitespace = true end_of_line = lf insert_final_newline = true +[*.sh] +tab_width = 4 +indent_size = 4 +indent_style = tab + [*.d] dfmt_align_switch_statements = true dfmt_brace_style = allman diff --git a/README.md b/README.md index 1e88b67..1b22db7 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ dfmt_outdent_labels (Not yet implemented) | `true`, `false` | `true` | Decrease dfmt_align_switch_statements (Not yet implemented) | `true`, `false` | `true` | Align labels, cases, and defaults with their enclosing switch dfmt_outdent_attributes (Not yet implemented) | `true`, `false` | `true` | Decrease the indentation level of attributes dfmt_split_operator_at_line_end (Not yet implemented) | `true`, `false` | `false` | Place operators on the end of the previous line when splitting lines -dfmt_space_after_cast (Not yet implemented) | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression +dfmt_space_after_cast | `true`, `false` | `false` | Insert space after the closing paren of a `cast` expression dfmt_space_after_keywords (Not yet implemented) | `true`, `false` | `true` | Insert space after `if`, `while`, `foreach`, etc, and before the `(` ## Terminology diff --git a/src/dfmt/config.d b/src/dfmt/config.d index f5a3eaa..c54f0c1 100644 --- a/src/dfmt/config.d +++ b/src/dfmt/config.d @@ -23,21 +23,21 @@ enum BraceStyle struct Config { /// - OptionalBoolean dfmt_align_switch_statements = OptionalBoolean.t; + OptionalBoolean dfmt_align_switch_statements; /// - BraceStyle dfmt_brace_style = BraceStyle.allman; + BraceStyle dfmt_brace_style; /// - OptionalBoolean dfmt_outdent_attributes = OptionalBoolean.t; + OptionalBoolean dfmt_outdent_attributes; /// - OptionalBoolean dfmt_outdent_labels = OptionalBoolean.t; + OptionalBoolean dfmt_outdent_labels; /// - int dfmt_soft_max_line_length = 80; + int dfmt_soft_max_line_length = -1; /// - OptionalBoolean dfmt_space_after_cast = OptionalBoolean.t; + OptionalBoolean dfmt_space_after_cast; /// - OptionalBoolean dfmt_space_after_keywords = OptionalBoolean.t; + OptionalBoolean dfmt_space_after_keywords; /// - OptionalBoolean dfmt_split_operator_at_line_end = OptionalBoolean.f; + OptionalBoolean dfmt_split_operator_at_line_end; mixin StandardEditorConfigFields; @@ -48,12 +48,20 @@ struct Config */ void initializeWithDefaults() { - pattern = "*.d"; + pattern = "*.d"; end_of_line = EOL.lf; indent_style = IndentStyle.space; indent_size = 4; tab_width = 4; max_line_length = 120; + dfmt_align_switch_statements = OptionalBoolean.t; + dfmt_brace_style = BraceStyle.allman; + dfmt_outdent_attributes = OptionalBoolean.t; + dfmt_outdent_labels = OptionalBoolean.t; + dfmt_soft_max_line_length = 80; + dfmt_space_after_cast = OptionalBoolean.t; + dfmt_space_after_keywords = OptionalBoolean.t; + dfmt_split_operator_at_line_end = OptionalBoolean.f; } /** diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index e8f88ba..608c384 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -650,6 +650,8 @@ private: void formatKeyword() { + import dfmt.editorconfig : OptionalBoolean; + switch (current.type) { case tok!"default": @@ -657,6 +659,8 @@ private: break; case tok!"cast": writeToken(); + if (currentIs(tok!"(")) + writeParens(config.dfmt_space_after_cast == OptionalBoolean.t); break; case tok!"try": if (peekIs(tok!"{")) @@ -1062,12 +1066,15 @@ private: body { immutable int depth = parenDepth; + parenDepth = 0; do { - formatStep(); spaceAfterParens = spaceAfter; + formatStep(); } - while (index < tokens.length && parenDepth > depth); + while (index < tokens.length && parenDepth > 0); + parenDepth = depth; + spaceAfterParens = spaceAfter; } void indent() diff --git a/src/dfmt/main.d b/src/dfmt/main.d index ea89e50..8409b5c 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -24,6 +24,30 @@ else Config optConfig; optConfig.pattern = "*.d"; bool showHelp; + + void handleBooleans(string option, string value) + { + import dfmt.editorconfig : OptionalBoolean; + import std.exception : enforce; + enforce(value == "true" || value == "false", "Invalid argument"); + switch (option) + { + case "outdent_attributes": + optConfig.dfmt_outdent_attributes = value == "true" ? OptionalBoolean.t : OptionalBoolean.f; + break; + case "outdent_labels": + optConfig.dfmt_outdent_labels = value == "true" ? OptionalBoolean.t : OptionalBoolean.f; + break; + case "space_after_cast": + optConfig.dfmt_space_after_cast = value == "true" ? OptionalBoolean.t : OptionalBoolean.f; + break; + case "split_operator_at_line_end": + optConfig.dfmt_split_operator_at_line_end = value == "true" ? OptionalBoolean.t : OptionalBoolean.f; + break; + default: assert(false, "Invalid command-line switch"); + } + } + getopt(args, "align_switch_statements", &optConfig.dfmt_align_switch_statements, "brace_style", &optConfig.dfmt_brace_style, @@ -34,10 +58,10 @@ else "inplace", &inplace, "max_line_length", &optConfig.max_line_length, "max_line_length", &optConfig.max_line_length, - "outdent_attributes", &optConfig.dfmt_outdent_attributes, - "outdent_labels", &optConfig.dfmt_outdent_labels, - "space_after_cast", &optConfig.dfmt_space_after_cast, - "split_operator_at_line_end", &optConfig.dfmt_split_operator_at_line_end, + "outdent_attributes", &handleBooleans, + "outdent_labels", &handleBooleans, + "space_after_cast", &handleBooleans, + "split_operator_at_line_end", &handleBooleans, "tab_width", &optConfig.tab_width); if (showHelp) @@ -132,11 +156,6 @@ Formatting Options: } private string createFilePath(bool readFromStdin, string fileName) -//out (result) -//{ -// stderr.writeln(__FUNCTION__, ": ", result); -//} -//body { import std.file : getcwd; import std.path : isRooted; diff --git a/tests/allman/.d.ref b/tests/allman/.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/allman/issue0031.d.ref b/tests/allman/issue0031.d.ref new file mode 100644 index 0000000..c9ea8ef --- /dev/null +++ b/tests/allman/issue0031.d.ref @@ -0,0 +1,6 @@ +import std.stdio : writeln; + +void main() +{ + writeln(cast(dchar)uint.max); +} diff --git a/tests/gen_expected.sh b/tests/gen_expected.sh index 2226466..30388cd 100755 --- a/tests/gen_expected.sh +++ b/tests/gen_expected.sh @@ -1,5 +1,10 @@ -dfmt --braces=allman $1.d > allman/$1.d.ref -dfmt --braces=otbs $1.d > otbs/$1.d.ref +argsFile=$1.args +if [ -e ${argsFile} ]; then + args=$(cat ${argsFile}) +fi +echo ${args} +dfmt --brace_style=allman ${args} $1.d > allman/$1.d.ref +dfmt --brace_style=otbs ${args} $1.d > otbs/$1.d.ref echo "------------------" echo "allman:" diff --git a/tests/issue0031.args b/tests/issue0031.args new file mode 100644 index 0000000..5fd15c8 --- /dev/null +++ b/tests/issue0031.args @@ -0,0 +1 @@ +--space_after_cast=false diff --git a/tests/issue0031.d b/tests/issue0031.d new file mode 100644 index 0000000..b23c2c6 --- /dev/null +++ b/tests/issue0031.d @@ -0,0 +1,6 @@ +import std.stdio : writeln; + +void main() +{ + writeln(cast(dchar) uint.max); +} diff --git a/tests/otbs/.d.ref b/tests/otbs/.d.ref new file mode 100644 index 0000000..e69de29 diff --git a/tests/otbs/issue0031.d.ref b/tests/otbs/issue0031.d.ref new file mode 100644 index 0000000..aadc052 --- /dev/null +++ b/tests/otbs/issue0031.d.ref @@ -0,0 +1,5 @@ +import std.stdio : writeln; + +void main() { + writeln(cast(dchar)uint.max); +} diff --git a/tests/test b/tests/test new file mode 100755 index 0000000..5c66bf9 --- /dev/null +++ b/tests/test @@ -0,0 +1,16 @@ +#!/usr/bin/env bash +set -e + +for braceStyle in allman otbs +do + for source in *.d + do + echo "${source}.ref" "${braceStyle}/${source}.out" + argsFile=$(basename ${source}).args + if [ -e ${argsFile} ]; then + args=$(cat ${argsFile}) + fi + ../bin/dfmt --brace_style=${braceStyle} ${args} "${source}" > "${braceStyle}/${source}.out" + diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out" + done +done diff --git a/tests/test.sh b/tests/test.sh index ea3ffd9..7f11c5a 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -6,7 +6,13 @@ do for source in *.d do echo "${source}.ref" "${braceStyle}/${source}.out" - ../bin/dfmt --brace_style=${braceStyle} "${source}" > "${braceStyle}/${source}.out" + argsFile=$(basename ${source} .d).args + if [ -e ${argsFile} ]; then + args=$(cat ${argsFile}) + else + args= + fi + ../bin/dfmt --brace_style=${braceStyle} ${args} "${source}" > "${braceStyle}/${source}.out" diff -u "${braceStyle}/${source}.ref" "${braceStyle}/${source}.out" done done